Remove some code from _py3_compat.

diff --git a/dulwich/_py3_compat.py b/dulwich/_py3_compat.py
index d999e07e7a655006d08d312a2826b139537e4a77..b6287a6760efb12ebc827b98a182ad7ce4ce1fc6 100644 (file)
--- a/dulwich/_py3_compat.py
+++ b/dulwich/_py3_compat.py
@@ -25,18 +25,11 @@ PY3 = sys.version_info[0] == 3
 
 if PY2:
     text_type = unicode
-    #string_types = (str, unicode)
-    #unichr = unichr
-    integer_types = (int, long)
 else:
     text_type = str
-    #string_types = (str,)
-    #unichr = chr
-    integer_types = (int, )
 
 
 if PY2:
-    int2byte = chr
     def byte2int(bs):
         return ord(bs[0])
     def indexbytes(buf, i):
@@ -44,18 +37,13 @@ if PY2:
     def iterbytes(buf):
         return (ord(byte) for byte in buf)
 else:
-    int2byte = operator.methodcaller("to_bytes", 1, "big")
     byte2int = operator.itemgetter(0)
     indexbytes = operator.getitem
     iterbytes = iter
 
 
 if PY2:
-    keys = lambda d: d.iterkeys()
-    values = lambda d: d.itervalues()
     items = lambda d: d.iteritems()
 else:
-    keys = lambda d: d.keys()
-    values = lambda d: d.values()
     items = lambda d: d.items()
 

diff --git a/dulwich/objects.py b/dulwich/objects.py
index 10ff8ff2afc395d9658494e4272f70a347dc7c5f..75538242a7001f3ceb930cb1ee94fb38d699eca2 100644 (file)
--- a/dulwich/objects.py
+++ b/dulwich/objects.py
@@ -41,7 +41,6 @@ from dulwich.file import GitFile
 from dulwich._py3_compat import (
     byte2int,
     indexbytes,
-    integer_types,
     iterbytes,
     items,
     text_type,
@@ -821,8 +820,6 @@ def sorted_tree_items(entries, name_order):
     for name, entry in sorted(items(entries), key=key_func):
         mode, hexsha = entry
         # Stricter type checks than normal to mirror checks in the C version.
-        if not isinstance(mode, integer_types):
-            raise TypeError('Expected integer/long for mode, got %r' % mode)
         mode = int(mode)
         if not isinstance(hexsha, bytes):
             raise TypeError('Expected bytes for SHA, got %r' % hexsha)

diff --git a/dulwich/refs.py b/dulwich/refs.py
index 6eea463975ebb951b7b6eebeee19d18c93f9b76e..20b711121c097a48a7e13a3cc8c282302d3cb75e 100644 (file)
--- a/dulwich/refs.py
+++ b/dulwich/refs.py
@@ -39,7 +39,6 @@ from dulwich.file import (
 from dulwich._py3_compat import (
     iterbytes,
     items,
-    keys,
     )
 
 
@@ -733,7 +732,7 @@ def write_packed_refs(f, packed_refs, peeled_refs=None):
         peeled_refs = {}
     else:
         f.write(b'# pack-refs with: peeled\n')
-    for refname in sorted(keys(packed_refs)):
+    for refname in sorted(packed_refs.keys()):
         f.write(git_line(packed_refs[refname], refname))
         if refname in peeled_refs:
             f.write(b'^' + peeled_refs[refname] + b'\n')