Add tests for sorted_tree_items and C implementation.

[jelmer/dulwich-libgit2.git] / dulwich / objects.py

diff --git a/dulwich/objects.py b/dulwich/objects.py
index d78e6d7e00b0c95491eccc2cb3be42852fb82ed2..30eda68f9665ffdf08911a07e9f327867f87bd72 100644 (file)
--- a/dulwich/objects.py
+++ b/dulwich/objects.py
@@ -706,10 +706,15 @@ def sorted_tree_items(entries):
     the items would be serialized.
 
     :param entries: Dictionary mapping names to (mode, sha) tuples
-    :return: Iterator over (name, mode, sha)
+    :return: Iterator over (name, mode, hexsha)
     """
     for name, entry in sorted(entries.iteritems(), cmp=cmp_entry):
-        yield name, entry[0], entry[1]
+        mode, hexsha = entry
+        # Stricter type checks than normal to mirror checks in the C version.
+        mode = int(mode)
+        if not isinstance(hexsha, str):
+            raise TypeError('Expected a string for SHA, got %r' % hexsha)
+        yield name, mode, hexsha
 
 
 def cmp_entry((name1, value1), (name2, value2)):