diff options
Diffstat (limited to 'rteval/modules')
| -rw-r--r-- | rteval/modules/__init__.py | 6 | ||||
| -rw-r--r-- | rteval/modules/loads/__init__.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py index 726619d..52122ab 100644 --- a/rteval/modules/__init__.py +++ b/rteval/modules/__init__.py @@ -46,7 +46,11 @@ class RtEvalModules(object): self._logger.log(Log.INFO, "importing module %s" % modname) mod = __import__("%s.%s" % (modroot, modname), fromlist=modroot) - self.__modules[modname] = mod.create(modcfg, self._logger) + return mod.create(modcfg, self._logger) + + + def _RegisterModuleObject(self, modname, modobj): + self.__modules[modname] = modobj def ModulesLoaded(self): diff --git a/rteval/modules/loads/__init__.py b/rteval/modules/loads/__init__.py index 3539624..675fcc0 100644 --- a/rteval/modules/loads/__init__.py +++ b/rteval/modules/loads/__init__.py @@ -151,7 +151,8 @@ class LoadModules(RtEvalModules): # for now (jcw) if m[1].lower() == 'module': self._cfg.AppendConfig(m[0], modparams) - self._Import(m[0], self._cfg.GetSection(m[0])) + modobj = self._Import(m[0], self._cfg.GetSection(m[0])) + self._RegisterModuleObject(m[0], modobj) def MakeReport(self): |