From 28e78d1db80bca9ae46fa0ef9a1161fb5f5ed787 Mon Sep 17 00:00:00 2001 From: Tomas Gavenciak Date: Sat, 11 Sep 2010 17:55:09 +0200 Subject: [PATCH] Moved module loading, use __import__() now General util.load_module returns module by name. Hook adding in pipeline removed (and distributed to tasktype module loading and extension module loading, both in Eval) --- t/moe/pipeline.py | 15 --------------- t/moe/util.py | 8 ++++++++ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/t/moe/pipeline.py b/t/moe/pipeline.py index f14a0f5..22422e6 100644 --- a/t/moe/pipeline.py +++ b/t/moe/pipeline.py @@ -51,21 +51,6 @@ class MoePipeline: self.index = -1 moe.log.default.verbose(">> Pipeline %s finished\n" % self.name) - def add_hook(self, name): - modname = "moe.hooks." + name - moe.log.default.verbose(">> Loading hook %s\n" % name) - if not sys.modules.has_key(modname): - ## FIXME: Configuration variable for the hook directory? - try: - fp, path, desc = imp.find_module(name, ["moe/hooks"]) - except ImportError: - raise MoePipeError, "Cannot find hook module " + modname - try: - imp.load_module(modname, fp, path, desc) - finally: - fp.close() - sys.modules[modname].init(self) - def configure(self, names): for name in names.split(): self.add_hook(name) diff --git a/t/moe/util.py b/t/moe/util.py index c7bbb5f..a2ef34e 100644 --- a/t/moe/util.py +++ b/t/moe/util.py @@ -33,3 +33,11 @@ def remove_tree_contents(dir): shutil.rmtree(os.path.join(dir, f)) else: raise err + +def load_module(modname): + """Return the module `modname` (full name) if loaded, or try to import it. + Returns the module or raises `ImportError`.""" + if not sys.modules.has_key(modname): + moe.log.debug("Loading module %s" % (path, name)) + __import__(modname) + return sys.modules[modname] -- 2.39.2