summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Scott <barry@barrys-emacs.org>2016-06-06 10:45:16 +0100
committerBarry Scott <barry@barrys-emacs.org>2016-06-06 10:45:16 +0100
commit6891caf73735ea465c909de8dc13129cc98c47f7 (patch)
treee3e7d66aa6103e0481f3f04ddfd2fcde1890aeba
parent4a5cebaeda2c5062fb6c727f457ee3288f6046ef (diff)
downloadgitpython-6891caf73735ea465c909de8dc13129cc98c47f7.tar.gz
Can get a str object from stream.read rather then bytes.
Convert to the expected bytes.
-rw-r--r--git/cmd.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index f992a399..633aedcb 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -338,7 +338,10 @@ class Git(LazyMixin):
def read_all_from_possibly_closed_stream(stream):
try:
- return stderr + stream.read()
+ last_stderr = stream.read()
+ if type(last_stderr) == unicode:
+ last_stderr = last_stderr.encode(defenc)
+ return stderr + last_stderr
except ValueError:
return stderr or b''