Don't import * from helpers

[bup.git] / lib / bup / t / tgit.py

diff --git a/lib/bup/t/tgit.py b/lib/bup/t/tgit.py
index 1fa1c1c6d3f2d759f9b8cf74e14f1455e4b8fb25..8665e8011c1a69f9912e8bdea7e70ef35988c739 100644 (file)
--- a/lib/bup/t/tgit.py
+++ b/lib/bup/t/tgit.py
@@ -1,7 +1,9 @@
-import struct, os, tempfile, time
 from subprocess import check_call
+import struct, os, subprocess, tempfile, time
+
 from bup import git
-from bup.helpers import *
+from bup.helpers import log, mkdirp, readpipe
+
 from wvtest import *
 
 
@@ -39,14 +41,17 @@ def testmangle():
     WVPASSEQ(git.mangle_name("f.bup", afile, adir), "f.bup.bup")
     WVPASSEQ(git.mangle_name("f", afile, adir), "f.bup")
 
-    WVPASSEQ(git.demangle_name("f.bup"), ("f", git.BUP_CHUNKED))
-    WVPASSEQ(git.demangle_name("f.bupl"), ("f", git.BUP_NORMAL))
-    WVPASSEQ(git.demangle_name("f.bup.bupl"), ("f.bup", git.BUP_NORMAL))
+    WVPASSEQ(git.demangle_name("f.bup", afile), ("f", git.BUP_CHUNKED))
+    WVPASSEQ(git.demangle_name("f.bupl", afile), ("f", git.BUP_NORMAL))
+    WVPASSEQ(git.demangle_name("f.bup.bupl", afile), ("f.bup", git.BUP_NORMAL))
+
+    WVPASSEQ(git.demangle_name(".bupm", afile), ('', git.BUP_NORMAL))
+    WVPASSEQ(git.demangle_name(".bupm", adir), ('', git.BUP_CHUNKED))
 
     # for safety, we ignore .bup? suffixes we don't recognize.  Future
     # versions might implement a .bup[a-z] extension as something other
     # than BUP_NORMAL.
-    WVPASSEQ(git.demangle_name("f.bupa"), ("f.bupa", git.BUP_NORMAL))
+    WVPASSEQ(git.demangle_name("f.bupa", afile), ("f.bupa", git.BUP_NORMAL))
 
 
 @wvtest
@@ -190,7 +195,7 @@ def test_check_repo_or_die():
         open(bupdir + '/objects/pack', 'w').close()
         try:
             git.check_repo_or_die()
-        except SystemExit, e:
+        except SystemExit as e:
             WVPASSEQ(e.code, 14)
         else:
             WVFAIL()
@@ -199,7 +204,7 @@ def test_check_repo_or_die():
 
         try:
             git.check_repo_or_die('nonexistantbup.tmp')
-        except SystemExit, e:
+        except SystemExit as e:
             WVPASSEQ(e.code, 15)
         else:
             WVFAIL()