Fixed small error (which should manifest anyway)

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

diff --git a/t/moe/util.py b/t/moe/util.py
index 69007a193429f62bf2eadfb68527aa120a06a463..c7bbb5f4eea1dfdf8b68dde99cae8c0a01c02eaa 100644 (file)
--- a/t/moe/util.py
+++ b/t/moe/util.py
@@ -7,18 +7,29 @@ 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:
        os.link(src, dest)
     except OSError:
        shutil.copyfile(src, dest)
+
+def remove_tree_contents(dir):
+    for f in os.listdir(dir):
+       name = os.path.join(dir, f)
+       try:
+           os.unlink(name)
+       except OSError, err:
+           if err.errno == os.errno.EISDIR:
+               shutil.rmtree(os.path.join(dir, f))
+           else:
+               raise err