summaryrefslogtreecommitdiff
path: root/git/compat.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-06-20 06:51:08 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-06-20 06:51:08 +0200
commitf128ae9a37036614c1b5d44e391ba070dd4326d1 (patch)
tree5332b1ef2152d1df93d1a0d35143d86a0d229a06 /git/compat.py
parent07a8f73dca7ec7c2aeb6aa47aaf421d8d22423ad (diff)
parente9405ac82af3a804dba1f9797bdb34815e1d7a18 (diff)
downloadgitpython-f128ae9a37036614c1b5d44e391ba070dd4326d1.tar.gz
Merge branch 'master' into fix-non-ascii-chars-in-status-linesfix-non-ascii-chars-in-status-lines
Diffstat (limited to 'git/compat.py')
-rw-r--r--git/compat.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/compat.py b/git/compat.py
index 5b46255c..b3572474 100644
--- a/git/compat.py
+++ b/git/compat.py
@@ -35,6 +35,7 @@ if PY3:
return d.values()
range = xrange
unicode = str
+ binary_type = bytes
else:
FileType = file
# usually, this is just ascii, which might not enough for our encoding needs
@@ -44,6 +45,7 @@ else:
byte_ord = ord
bchr = chr
unicode = unicode
+ binary_type = str
range = xrange
def mviter(d):
return d.itervalues()