X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=t%2Fmoe%2Futil.py;h=a2ef34e602b762df66ba5121dba066616b85ba4b;hb=28e78d1db80bca9ae46fa0ef9a1161fb5f5ed787;hp=e083f0fb6f84dbfe285d342c8482036211d05d2e;hpb=5701572b35e7ebc7c2d96cc603cd720fb2649ac4;p=moe.git

diff --git a/t/moe/util.py b/t/moe/util.py
index e083f0f..a2ef34e 100644
--- 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]