diff options
author | rcoh <rcoh@mit.edu> | 2010-12-29 17:27:33 -0500 |
---|---|---|
committer | rcoh <rcoh@mit.edu> | 2010-12-29 17:27:33 -0500 |
commit | 93dfb8e3003b483c1041c6f7b4ff293935aeb7c0 (patch) | |
tree | 6b0e336f664fa519cad164756b68840e56b50b16 /LightInstallation.py | |
parent | c8209d01f9ddf4c6670caee08073924cb33e447f (diff) |
Inheritence now happens at all levels on reading of config files. No additional resolution of
inheritances should be necessary. RCOH
Diffstat (limited to 'LightInstallation.py')
-rw-r--r-- | LightInstallation.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/LightInstallation.py b/LightInstallation.py index 8b2d059..9f9f6da 100644 --- a/LightInstallation.py +++ b/LightInstallation.py @@ -26,6 +26,7 @@ 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') @@ -88,11 +89,7 @@ class LightInstallation: def initializeComponent(self, config): components = [] if config != None: - config = configGetter.resolveConfigInheritance(config) for configItem in config.getchildren(): - configItem = configGetter.resolveConfigInheritance(configItem) #resolve - #inheritences. TODO: migrate to a recursive inheritence resolver that gets run on - #file-parse try: [module,className] = configItem.find('Class').text.split('.') except: |