Moved module loading, use __import__() now

[moe.git] / t / moe / util.py

diff --git a/t/moe/util.py b/t/moe/util.py
index e083f0fb6f84dbfe285d342c8482036211d05d2e..a2ef34e602b762df66ba5121dba066616b85ba4b 100644 (file)
--- a/t/moe/util.py
+++ b/t/moe/util.py
@@ -7,15 +7,15 @@ import shutil
 def mkdir_tree(name):
     try:
        os.mkdir(name)  
-    except OSError, e:
-       if e.errno == os.errno.ENOENT:
+    except OSError, err:
+       if err.errno == os.errno.ENOENT:
            head, tail = os.path.split(name)
            mkdir_tree(head)
            os.mkdir(name)
-       elif e.errno == os.errno.EEXIST:
+       elif err.errno == os.errno.EEXIST:
            pass
        else:
-           raise e
+           raise err
 
 def link_or_copy(src, dest):
     try:
@@ -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]