Once again, fix tests on python3.

dulwich/archive.py

@@ -87,7 +87,7 @@ def tar_stream(store, tree, mtime, format=''):
             data = ListBytesIO(blob.chunked)
 
             info = tarfile.TarInfo()
-            info.name = entry_abspath
+            info.name = entry_abspath.decode('ascii') # tarfile only works with ascii.
             info.size = blob.raw_length()
             info.mode = entry.mode
             info.mtime = mtime
@@ -99,7 +99,7 @@ def tar_stream(store, tree, mtime, format=''):
     yield buf.getvalue()
 
 
-def _walk_tree(store, tree, root=''):
+def _walk_tree(store, tree, root=b''):
     """Recursively walk a dulwich Tree, yielding tuples of
     (absolute path, TreeEntry) along the way.
     """

dulwich/objectspec.py

@@ -134,7 +134,7 @@ def parse_commit_range(repo, committishs):
     """
     committishs = to_bytes(committishs)
     # TODO(jelmer): Support more than a single commit..
-    return iter([parse_commit(committishs)])
+    return iter([parse_commit(repo, committishs)])
 
 
 def parse_commit(repo, committish):

dulwich/tests/test_archive.py

@@ -43,7 +43,7 @@ class ArchiveTests(TestCase):
         store = MemoryObjectStore()
         c1, c2, c3 = build_commit_graph(store, [[1], [2, 1], [3, 1, 2]])
         tree = store[c3.tree]
-        stream = ''.join(tar_stream(store, tree, 10))
+        stream = b''.join(tar_stream(store, tree, 10))
         out = BytesIO(stream)
         tf = tarfile.TarFile(fileobj=out)
         self.addCleanup(tf.close)
@@ -51,12 +51,12 @@ class ArchiveTests(TestCase):
 
     def test_simple(self):
         store = MemoryObjectStore()
-        b1 = Blob.from_string("somedata")
+        b1 = Blob.from_string(b"somedata")
         store.add_object(b1)
         t1 = Tree()
         t1.add(b"somename", 0o100644, b1.id)
         store.add_object(t1)
-        stream = ''.join(tar_stream(store, t1, 10))
+        stream = b''.join(tar_stream(store, t1, 10))
         out = BytesIO(stream)
         tf = tarfile.TarFile(fileobj=out)
         self.addCleanup(tf.close)