Merge branch 'py2n3'0.6.0

* python 3 compatibility
* all tests work in py2.6, 2.7, 3.3, 3.4

1 files changed, 22 insertions, 19 deletions

diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
index f4cb5bb..963a71a 100644
--- a/gitdb/test/db/test_pack.py
+++ b/gitdb/test/db/test_pack.py
@@ -2,9 +2,12 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from lib import *
+from gitdb.test.db.lib import (
+    TestDBBase,
+    with_rw_directory,
+    with_packs_rw
+)
 from gitdb.db import PackedDB
-from gitdb.test.lib import fixture_path
 
 from gitdb.exc import BadObject, AmbiguousObjectName
 
@@ -12,45 +15,45 @@ import os
 import random
 
 class TestPackDB(TestDBBase):
-    
+
     @with_rw_directory
     @with_packs_rw
     def test_writing(self, path):
         pdb = PackedDB(path)
-        
+
         # on demand, we init our pack cache
         num_packs = len(pdb.entities())
         assert pdb._st_mtime != 0
-        
-        # test pack directory changed: 
+
+        # test pack directory changed:
         # packs removed - rename a file, should affect the glob
         pack_path = pdb.entities()[0].pack().path()
         new_pack_path = pack_path + "renamed"
         os.rename(pack_path, new_pack_path)
-        
+
         pdb.update_cache(force=True)
         assert len(pdb.entities()) == num_packs - 1
-        
+
         # packs added
         os.rename(new_pack_path, pack_path)
         pdb.update_cache(force=True)
         assert len(pdb.entities()) == num_packs
-    
+
         # bang on the cache
         # access the Entities directly, as there is no iteration interface
         # yet ( or required for now )
         sha_list = list(pdb.sha_iter())
         assert len(sha_list) == pdb.size()
-        
+
         # hit all packs in random order
         random.shuffle(sha_list)
-        
+
         for sha in sha_list:
-            info = pdb.info(sha)
-            stream = pdb.stream(sha)
+            pdb.info(sha)
+            pdb.stream(sha)
         # END for each sha to query
-        
-        
+
+
         # test short finding - be a bit more brutal here
         max_bytes = 19
         min_bytes = 2
@@ -64,10 +67,10 @@ class TestPackDB(TestDBBase):
                 pass # valid, we can have short objects
             # END exception handling
         # END for each sha to find
-        
+
         # we should have at least one ambiguous, considering the small sizes
-        # but in our pack, there is no ambigious ... 
+        # but in our pack, there is no ambigious ...
         # assert num_ambiguous
-        
+
         # non-existing
-        self.failUnlessRaises(BadObject, pdb.partial_to_complete_sha, "\0\0", 4)
+        self.failUnlessRaises(BadObject, pdb.partial_to_complete_sha, b'\0\0', 4)