Support bytes and str as mixed keys

jirikuncar · Feb 16, 2018 · dc6614e · dc6614e
1 parent da9525d
commit dc6614e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/git_json_tree.py b/git_json_tree.py
@@ -40,6 +40,11 @@
 from dulwich.objects import Blob, Tree
 from dulwich.repo import Repo
 
+try:
+    key_types = str, unicode
+except:
+    key_types = bytes, str
+
 __version__ = "0.1.0.dev20180121"
 
 GIT_FILEMODE_BLOB = 33188
@@ -123,7 +128,7 @@ def decode(repo, tree_id):
                 return {}
             raise TypeError('Unknown tree type.')
 
-        if all((isinstance(key[0], str) for key in items)):
+        if all((isinstance(key[0], key_types) for key in items)):
             return {key: decode(repo, sha) for key, sha in items}
         elif all((isinstance(key[0], int) for key in items)):
             items = ((int(key), decode(repo, sha)) for key, sha in items)

diff --git a/test_git_json_tree.py b/test_git_json_tree.py
@@ -28,7 +28,8 @@ def json_data():
             st.lists(children) |
             st.dictionaries(
                 st.text(
-                    set(printable) - set('/')
+                    set(printable) - set('/'),
+                    min_size=1,
                 ),
                 children,
             ),