test_submodule works

Byron · Byron · commit 4cfc682ff87d · 2015-01-06T14:11:48.000+01:00
diff --git a/git/objects/base.py b/git/objects/base.py
@@ -60,7 +60,7 @@ def new_from_sha(cls, repo, sha1):
         :param sha1: 20 byte binary sha1"""
         if sha1 == cls.NULL_BIN_SHA:
             # the NULL binsha is always the root commit
-            return get_object_type_by_name('commit')(repo, sha1)
+            return get_object_type_by_name(b'commit')(repo, sha1)
         # END handle special case
         oinfo = repo.odb.info(sha1)
         inst = get_object_type_by_name(oinfo.type)(repo, oinfo.binsha)
diff --git a/git/test/test_base.py b/git/test/test_base.py
@@ -86,7 +86,7 @@ def test_get_object_type_by_name(self):
             assert base.Object in get_object_type_by_name(tname).mro()
         # END for each known type
 
-        assert_raises(ValueError, get_object_type_by_name, "doesntexist")
+        assert_raises(ValueError, get_object_type_by_name, b"doesntexist")
 
     def test_object_resolution(self):
         # objects must be resolved to shas so they compare equal
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -80,7 +80,7 @@ def _do_base_tests(self, rwrepo):
         assert isinstance(sm.branch_path, string_types)
 
         # some commits earlier we still have a submodule, but its at a different commit
-        smold = Submodule.iter_items(rwrepo, self.k_subm_changed).next()
+        smold = next(Submodule.iter_items(rwrepo, self.k_subm_changed))
         assert smold.binsha != sm.binsha
         assert smold != sm                  # the name changed
 
