diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-02 10:23:48 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-02 10:23:48 -0500 |
| commit | b02b461c2a6b94fa9b27d26bfa4918f39769363c (patch) | |
| tree | 41b66b694594ee5b1b269de2c3b6d2ce33c3515d /LightInstallation.py | |
| parent | 93dfb8e3003b483c1041c6f7b4ff293935aeb7c0 (diff) | |
Changed default mode of xml merging to merge instead of replace. Added some syntactic sugar in xml
file -- attributes on Class-Level items will be automatically added to their args dict. This is
designed for easy specification of Id etc. when you are Inheriting from another class.
Diffstat (limited to 'LightInstallation.py')
| -rw-r--r-- | LightInstallation.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/LightInstallation.py b/LightInstallation.py index 9f9f6da..01fea1c 100644 --- a/LightInstallation.py +++ b/LightInstallation.py @@ -26,7 +26,6 @@ class LightInstallation: compReg.initRegistry() compReg.registerComponent(self.screen, 'Screen') #TODO: move to constants file config = configGetter.loadConfigFile(configFileName) - pdb.set_trace() #read configs from xml rendererConfig = config.find('RendererConfiguration') pixelConfig = config.find('PixelConfiguration') @@ -103,7 +102,7 @@ class LightInstallation: main_log.error('Error importing ' + module+'.'+'.className. Component not\ initialized.') continue #TODO: verify functions as expected - args = configGetter.generateArgDict(configItem.find('Args')) + args = configGetter.pullArgsFromItem(configItem) args['parentScope'] = self #TODO: we shouldn't give away scope #like this, find another way. try: |