diff options
author | Barry Scott <barry@barrys-emacs.org> | 2016-06-06 10:45:16 +0100 |
---|---|---|
committer | Barry Scott <barry@barrys-emacs.org> | 2016-06-06 10:45:16 +0100 |
commit | 6891caf73735ea465c909de8dc13129cc98c47f7 (patch) | |
tree | e3e7d66aa6103e0481f3f04ddfd2fcde1890aeba | |
parent | 4a5cebaeda2c5062fb6c727f457ee3288f6046ef (diff) | |
download | gitpython-6891caf73735ea465c909de8dc13129cc98c47f7.tar.gz |
Can get a str object from stream.read rather then bytes.
Convert to the expected bytes.
-rw-r--r-- | git/cmd.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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'' |