Merge pull request #408 from nvie/master

Add support for diffing against root commit

1 files changed, 5 insertions, 9 deletions

diff --git a/git/compat.py b/git/compat.py
index 146bfd4b..7bd8e494 100644
--- a/git/compat.py
+++ b/git/compat.py
@@ -8,7 +8,6 @@
 # flake8: noqa
 
 import sys
-import six
 
 from gitdb.utils.compat import (
     PY3,
@@ -34,6 +33,7 @@ if PY3:
         return bytes([n])
     def mviter(d):
         return d.values()
+    range = xrange
     unicode = str
 else:
     FileType = file
@@ -44,21 +44,17 @@ else:
     byte_ord = ord
     bchr = chr
     unicode = unicode
+    range = xrange
     def mviter(d):
         return d.itervalues()
 
-PRE_PY27 = sys.version_info < (2, 7)
-
 
 def safe_decode(s):
     """Safely decodes a binary string to unicode"""
-    if isinstance(s, six.text_type):
+    if isinstance(s, unicode):
         return s
-    elif isinstance(s, six.binary_type):
-        if PRE_PY27:
-            return s.decode(defenc)  # we're screwed
-        else:
-            return s.decode(defenc, errors='replace')
+    elif isinstance(s, bytes):
+        return s.decode(defenc, errors='replace')
     raise TypeError('Expected bytes or text, but got %r' % (s,))