More bytes handling

kevin-brown · kevin-brown · commit d8405ee00bfc · 2014-07-13T19:55:00.000-04:00
diff --git a/gitdb/db/base.py b/gitdb/db/base.py
@@ -22,6 +22,8 @@
 from itertools import chain
 from functools import reduce
 
+import sys
+
 
 __all__ = ('ObjectDBR', 'ObjectDBW', 'FileDBBase', 'CompoundDB', 'CachingDB')
 
@@ -176,6 +178,14 @@ def db_path(self, rela_path):
         """
         :return: the given relative path relative to our database root, allowing
             to pontentially access datafiles"""
+        if sys.version_info[0] == 3:
+            text_type = str
+        else:
+            text_type = basestring
+
+        if not isinstance(rela_path, text_type):
+            rela_path = rela_path.decode("utf-8")
+
         return join(self._root_path, rela_path)
     #} END interface
 
diff --git a/gitdb/fun.py b/gitdb/fun.py
@@ -402,7 +402,7 @@ def loose_object_header_info(m):
     :param m: memory map from which to read the compressed object data"""
     decompress_size = 8192      # is used in cgit as well
     hdr = decompressobj().decompress(m, decompress_size)
-    type_name, size = hdr[:hdr.find("\0")].split(" ")
+    type_name, size = hdr[:hdr.find("\0".encode("ascii"))].split(" ".encode("ascii"))
     return type_name, int(size)
 
 def pack_object_header_info(data):
diff --git a/gitdb/pack.py b/gitdb/pack.py
@@ -121,7 +121,11 @@ def pack_object_at(cursor, offset, as_stream):
 
     abs_data_offset = offset + total_rela_offset
     if as_stream:
-        stream = DecompressMemMapReader(buffer(data, total_rela_offset), False, uncomp_size)
+        try:
+            buff = memoryview(data)[total_rela_offset:].tobytes()
+        except (NameError, TypeError):
+            buff = buffer(data, total_rela_offset)
+        stream = DecompressMemMapReader(buff, False, uncomp_size)
         if delta_info is None:
             return abs_data_offset, OPackStream(offset, type_id, uncomp_size, stream)
         else:
diff --git a/gitdb/stream.py b/gitdb/stream.py
@@ -105,8 +105,8 @@ def _parse_header_info(self):
         maxb = 512              # should really be enough, cgit uses 8192 I believe
         self._s = maxb
         hdr = self.read(maxb)
-        hdrend = hdr.find("\0")
-        type, size = hdr[:hdrend].split(" ")
+        hdrend = hdr.find("\0".encode("ascii"))
+        type, size = hdr[:hdrend].split(" ".encode("ascii"))
         size = int(size)
         self._s = size
 
diff --git a/gitdb/test/db/test_ref.py b/gitdb/test/db/test_ref.py
@@ -19,7 +19,7 @@ def make_alt_file(self, alt_path, alt_list):
         The list can be empty"""
         alt_file = open(alt_path, "wb")
         for alt in alt_list:
-            alt_file.write(alt + "\n")
+            alt_file.write(alt.encode("utf-8") + "\n".encode("ascii"))
         alt_file.close()
 
     @with_rw_directory
