Fix Python 2 failures

Author: kevin-brown

gitdb/db/loose.py

@@ -161,8 +161,8 @@ def set_ostream(self, stream):
     def info(self, sha):
         m = self._map_loose_object(sha)
         try:
-            type, size = loose_object_header_info(m)
-            return OInfo(sha, type, size)
+            typ, size = loose_object_header_info(m)
+            return OInfo(sha, typ, size)
         finally:
             m.close()
         # END assure release of system resources

gitdb/db/mem.py

@@ -24,7 +24,7 @@
     DecompressMemMapReader,
 )
 
-from io import StringIO
+from io import BytesIO
 
 __all__ = ("MemoryDB", )
 
@@ -104,7 +104,7 @@ def stream_copy(self, sha_iter, odb):
 
             ostream = self.stream(sha)
             # compressed data including header
-            sio = StringIO(ostream.stream.data())
+            sio = BytesIO(ostream.stream.data())
             istream = IStream(ostream.type, ostream.size, sio, sha)
 
             odb.store(istream)

gitdb/fun.py

@@ -397,7 +397,7 @@ def loose_object_header_info(m):
     decompress_size = 8192      # is used in cgit as well
     hdr = decompressobj().decompress(m, decompress_size)
     type_name, size = hdr[:hdr.find("\0".encode("ascii"))].split(" ".encode("ascii"))
-    return type_name, int(size)
+    return type_name.decode("ascii"), int(size)
 
 def pack_object_header_info(data):
     """

gitdb/test/db/lib.py

@@ -24,7 +24,7 @@
 
 from async import IteratorReader
 
-from io import StringIO
+from io import BytesIO
 
 from struct import pack
 
@@ -44,7 +44,7 @@ def _assert_object_writing_simple(self, db):
         ni = 250
         for i in range(ni):
             data = pack(">L", i)
-            istream = IStream(str_blob_type, len(data), StringIO(data))
+            istream = IStream(str_blob_type, len(data), BytesIO(data))
             new_istream = db.store(istream)
             assert new_istream is istream
             assert db.has_object(istream.binsha)
@@ -82,7 +82,7 @@ def _assert_object_writing(self, db):
                 prev_ostream = db.set_ostream(ostream)
                 assert type(prev_ostream) in ostreams or prev_ostream in ostreams
 
-                istream = IStream(str_blob_type, len(data), StringIO(data))
+                istream = IStream(str_blob_type, len(data), BytesIO(data))
 
                 # store returns same istream instance, with new sha set
                 my_istream = db.store(istream)
@@ -132,8 +132,9 @@ def _assert_object_writing_async(self, db):
         ni = 5000
         def istream_generator(offset=0, ni=ni):
             for data_src in xrange(ni):
-                data = str(data_src + offset)
-                yield IStream(str_blob_type, len(data), StringIO(data))
+                print(type(data_src), type(offset))
+                data = bytes(data_src + offset)
+                yield IStream(str_blob_type, len(data), BytesIO(data))
             # END for each item
         # END generator utility
 

gitdb/test/test_example.py

@@ -8,7 +8,7 @@
 from gitdb.db import LooseObjectDB
 from gitdb.util import pool
 
-from io import StringIO
+from io import BytesIO
 
 from async import IteratorReader
 
@@ -33,8 +33,8 @@ def test_base(self):
             pass
         # END ignore exception if there are no loose objects
 
-        data = "my data"
-        istream = IStream("blob", len(data), StringIO(data))
+        data = "my data".encode("ascii")
+        istream = IStream("blob", len(data), BytesIO(data))
 
         # the object does not yet have a sha
         assert istream.binsha is None