summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-04-14 12:38:53 +0200
committerVincent Driessen <me@nvie.com>2016-04-14 12:39:58 +0200
commitaae2a7328a4d28077a4b4182b4f36f19c953765b (patch)
tree5eeafdd9fa69361b07a056fcd2e08dcd4f97d3d8
parent5de21c7fa2bdd5cd50c4f62ba848af54589167d0 (diff)
downloadgitpython-aae2a7328a4d28077a4b4182b4f36f19c953765b.tar.gz
Fix comment
-rw-r--r--git/compat.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/compat.py b/git/compat.py
index 146bfd4b..1630fcd5 100644
--- a/git/compat.py
+++ b/git/compat.py
@@ -56,7 +56,9 @@ def safe_decode(s):
return s
elif isinstance(s, six.binary_type):
if PRE_PY27:
- return s.decode(defenc) # we're screwed
+ # Python 2.6 does not support the `errors` argument, so we cannot
+ # control the replacement of unsafe chars in it.
+ return s.decode(defenc)
else:
return s.decode(defenc, errors='replace')
raise TypeError('Expected bytes or text, but got %r' % (s,))