0

Fixed/added some config parsing tests

This commit is contained in:
Andrew Chin
2012-01-02 01:10:43 -05:00
parent a1dc392526
commit c14cd1a66f
5 changed files with 39 additions and 17 deletions

View File

@@ -253,20 +253,19 @@ class MultiWorldParser(object):
for key in settingsDefinition.render:
option = settingsDefinition.render[key]
if option.has_key("default"):
self.defaults[key] = option.get("default")
self.defaults[key] = option["default"]
self.defaults.update(glob)
import pprint
pprint.pprint(glob, indent=2)
def validate(self):
for worldname in self.render:
world = self.render[worldname]
world = dict()
world.update(self.defaults)
world.update(self.render[worldname])
for key in world:
if key not in settingsDefinition.render:
@@ -278,8 +277,9 @@ class MultiWorldParser(object):
val = definition['validator'](world[key])
world[key] = val
except Exception as e:
print "Error: %r" % e
next
#print "Error validating %s: %r" % (key, e)
raise e
self.render[worldname] = world