Enable more python3 tests: for walker, pack, missing_obj_finder, diff_tree.

dulwich/tests/test_diff_tree.py

@@ -57,11 +57,9 @@ from dulwich.tests.utils import (
     make_object,
     functest_builder,
     ext_functest_builder,
-    skipIfPY3,
     )
 
 
-@skipIfPY3
 class DiffTestCase(TestCase):
 
     def setUp(self):
@@ -86,7 +84,6 @@ class DiffTestCase(TestCase):
         return self.store[commit_tree(self.store, commit_blobs)]
 
 
-@skipIfPY3
 class TreeChangesTest(DiffTestCase):
 
     def setUp(self):
@@ -470,7 +467,6 @@ class TreeChangesTest(DiffTestCase):
             [parent1, parent2], merge, rename_detector=self.detector)
 
 
-@skipIfPY3
 class RenameDetectionTest(DiffTestCase):
 
     def _do_test_count_blocks(self, count_blocks):
@@ -759,15 +755,16 @@ class RenameDetectionTest(DiffTestCase):
             self.detect_renames(tree1, tree2))
 
     def test_content_rename_with_more_deletions(self):
-        blob1 = make_object(Blob, data='')
-        tree1 = self.commit_tree([('a', blob1), ('b', blob1), ('c', blob1), ('d', blob1)])
-        tree2 = self.commit_tree([('e', blob1), ('f', blob1), ('g', blob1)])
+        blob1 = make_object(Blob, data=b'')
+        tree1 = self.commit_tree([(b'a', blob1), (b'b', blob1), (b'c', blob1),
+                                  (b'd', blob1)])
+        tree2 = self.commit_tree([(b'e', blob1), (b'f', blob1), (b'g', blob1)])
         self.maxDiff = None
         self.assertEqual(
-          [TreeChange(CHANGE_RENAME, ('a', F, blob1.id), ('e', F, blob1.id)),
-           TreeChange(CHANGE_RENAME, ('b', F, blob1.id), ('f', F, blob1.id)),
-           TreeChange(CHANGE_RENAME, ('c', F, blob1.id), ('g', F, blob1.id)),
-           TreeChange.delete(('d', F, blob1.id))],
+          [TreeChange(CHANGE_RENAME, (b'a', F, blob1.id), (b'e', F, blob1.id)),
+           TreeChange(CHANGE_RENAME, (b'b', F, blob1.id), (b'f', F, blob1.id)),
+           TreeChange(CHANGE_RENAME, (b'c', F, blob1.id), (b'g', F, blob1.id)),
+           TreeChange.delete((b'd', F, blob1.id))],
           self.detect_renames(tree1, tree2))
 
     def test_content_rename_gitlink(self):

dulwich/tests/test_missing_obj_finder.py

@@ -27,11 +27,9 @@ from dulwich.tests.utils import (
     make_object,
     make_tag,
     build_commit_graph,
-    skipIfPY3,
     )
 
 
-@skipIfPY3
 class MissingObjectFinderTest(TestCase):
 
     def setUp(self):
@@ -52,21 +50,20 @@ class MissingObjectFinderTest(TestCase):
             "some objects are not reported as missing: %s" % (expected, ))
 
 
-@skipIfPY3
 class MOFLinearRepoTest(MissingObjectFinderTest):
 
     def setUp(self):
         super(MOFLinearRepoTest, self).setUp()
-        f1_1 = make_object(Blob, data='f1') # present in 1, removed in 3
-        f2_1 = make_object(Blob, data='f2') # present in all revisions, changed in 2 and 3
-        f2_2 = make_object(Blob, data='f2-changed')
-        f2_3 = make_object(Blob, data='f2-changed-again')
-        f3_2 = make_object(Blob, data='f3') # added in 2, left unmodified in 3
+        f1_1 = make_object(Blob, data=b'f1') # present in 1, removed in 3
+        f2_1 = make_object(Blob, data=b'f2') # present in all revisions, changed in 2 and 3
+        f2_2 = make_object(Blob, data=b'f2-changed')
+        f2_3 = make_object(Blob, data=b'f2-changed-again')
+        f3_2 = make_object(Blob, data=b'f3') # added in 2, left unmodified in 3
 
         commit_spec = [[1], [2, 1], [3, 2]]
-        trees = {1: [('f1', f1_1), ('f2', f2_1)],
-                2: [('f1', f1_1), ('f2', f2_2), ('f3', f3_2)],
-                3: [('f2', f2_3), ('f3', f3_2)] }
+        trees = {1: [(b'f1', f1_1), (b'f2', f2_1)],
+                 2: [(b'f1', f1_1), (b'f2', f2_2), (b'f3', f3_2)],
+                 3: [(b'f2', f2_3), (b'f3', f3_2)] }
         # commit 1: f1 and f2
         # commit 2: f3 added, f2 changed. Missing shall report commit id and a
         # tree referenced by commit
@@ -111,7 +108,6 @@ class MOFLinearRepoTest(MissingObjectFinderTest):
         self.assertMissingMatch([self.cmt(3).id], [self.cmt(3).id], [])
 
 
-@skipIfPY3
 class MOFMergeForkRepoTest(MissingObjectFinderTest):
     # 1 --- 2 --- 4 --- 6 --- 7
     #          \        /
@@ -121,24 +117,24 @@ class MOFMergeForkRepoTest(MissingObjectFinderTest):
 
     def setUp(self):
         super(MOFMergeForkRepoTest, self).setUp()
-        f1_1 = make_object(Blob, data='f1')
-        f1_2 = make_object(Blob, data='f1-2')
-        f1_4 = make_object(Blob, data='f1-4')
-        f1_7 = make_object(Blob, data='f1-2') # same data as in rev 2
-        f2_1 = make_object(Blob, data='f2')
-        f2_3 = make_object(Blob, data='f2-3')
-        f3_3 = make_object(Blob, data='f3')
-        f3_5 = make_object(Blob, data='f3-5')
+        f1_1 = make_object(Blob, data=b'f1')
+        f1_2 = make_object(Blob, data=b'f1-2')
+        f1_4 = make_object(Blob, data=b'f1-4')
+        f1_7 = make_object(Blob, data=b'f1-2') # same data as in rev 2
+        f2_1 = make_object(Blob, data=b'f2')
+        f2_3 = make_object(Blob, data=b'f2-3')
+        f3_3 = make_object(Blob, data=b'f3')
+        f3_5 = make_object(Blob, data=b'f3-5')
         commit_spec = [[1], [2, 1], [3, 2], [4, 2], [5, 3], [6, 3, 4], [7, 6]]
-        trees = {1: [('f1', f1_1), ('f2', f2_1)],
-                2: [('f1', f1_2), ('f2', f2_1)], # f1 changed
+        trees = {1: [(b'f1', f1_1), (b'f2', f2_1)],
+                2: [(b'f1', f1_2), (b'f2', f2_1)], # f1 changed
                 # f3 added, f2 changed
-                3: [('f1', f1_2), ('f2', f2_3), ('f3', f3_3)],
-                4: [('f1', f1_4), ('f2', f2_1)],  # f1 changed
-                5: [('f1', f1_2), ('f3', f3_5)], # f2 removed, f3 changed
-                6: [('f1', f1_4), ('f2', f2_3), ('f3', f3_3)], # merged 3 and 4
+                3: [(b'f1', f1_2), (b'f2', f2_3), (b'f3', f3_3)],
+                4: [(b'f1', f1_4), (b'f2', f2_1)],  # f1 changed
+                5: [(b'f1', f1_2), (b'f3', f3_5)], # f2 removed, f3 changed
+                6: [(b'f1', f1_4), (b'f2', f2_3), (b'f3', f3_3)], # merged 3 and 4
                 # f1 changed to match rev2. f3 removed
-                7: [('f1', f1_7), ('f2', f2_3)]}
+                7: [(b'f1', f1_7), (b'f2', f2_3)]}
         self.commits = build_commit_graph(self.store, commit_spec, trees)
 
         self.f1_2_id = f1_2.id
@@ -198,11 +194,12 @@ class MOFMergeForkRepoTest(MissingObjectFinderTest):
 
 
 class MOFTagsTest(MissingObjectFinderTest):
+
     def setUp(self):
         super(MOFTagsTest, self).setUp()
-        f1_1 = make_object(Blob, data='f1')
+        f1_1 = make_object(Blob, data=b'f1')
         commit_spec = [[1]]
-        trees = {1: [('f1', f1_1)]}
+        trees = {1: [(b'f1', f1_1)]}
         self.commits = build_commit_graph(self.store, commit_spec, trees)
 
         self._normal_tag = make_tag(self.cmt(1))

dulwich/tests/test_pack.py

@@ -74,7 +74,6 @@ from dulwich.tests import (
 from dulwich.tests.utils import (
     make_object,
     build_pack,
-    skipIfPY3,
     )
 
 pack1_sha = b'bc63ddad95e7321ee734ea11a7a62d314e0d7481'
@@ -848,7 +847,6 @@ class DeltaChainIteratorTests(TestCase):
         self.fetched.add(hex_sha)
         return self.store.get_raw(hex_sha)
 
-    @skipIfPY3
     def make_pack_iter(self, f, thin=None):
         if thin is None:
             thin = bool(list(self.store))

dulwich/tests/test_walk.py

@@ -49,7 +49,6 @@ from dulwich.tests.utils import (
     F,
     make_object,
     build_commit_graph,
-    skipIfPY3,
     )
 
 
@@ -71,7 +70,6 @@ class TestWalkEntry(object):
         return self.changes == other.changes()
 
 
-@skipIfPY3
 class WalkerTest(TestCase):
 
     def setUp(self):