summaryrefslogtreecommitdiff
path: root/gitdb/utils/encoding.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-13 18:31:17 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-13 18:31:17 +0100
commit641b64c9f48139cf06774805d32892012fb9b82d (patch)
tree144b400955067f0d4297fb06d2af6c58eac2cfb1 /gitdb/utils/encoding.py
parentbf942a913d69eb2079f9e82888aaccf2f6222643 (diff)
downloadgitdb-641b64c9f48139cf06774805d32892012fb9b82d.tar.gz
Now tests work consistently in py2 and 3
It's a nice way of saying that there is still one failing, consistently.
Diffstat (limited to 'gitdb/utils/encoding.py')
-rw-r--r--gitdb/utils/encoding.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/gitdb/utils/encoding.py b/gitdb/utils/encoding.py
index 12164e7..617b51c 100644
--- a/gitdb/utils/encoding.py
+++ b/gitdb/utils/encoding.py
@@ -11,9 +11,6 @@ def force_bytes(data, encoding="utf-8"):
if isinstance(data, bytes):
return data
- if isinstance(data, compat.memoryview):
- return bytes(data)
-
if isinstance(data, string_types):
return data.encode(encoding)
@@ -27,6 +24,7 @@ def force_text(data, encoding="utf-8"):
return data.decode(encoding)
if not isinstance(data, bytes):
+ assert False, "Shouldn't be here"
data = force_bytes(data, encoding)
if compat.PY3: