diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2016-04-10 11:22:17 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2016-04-10 11:22:17 +0200 |
commit | 9debf6b0aafb6f7781ea9d1383c86939a1aacde3 (patch) | |
tree | 8a7ce747a4615770481013dc9a2cf944d02bf6db /git/cmd.py | |
parent | dabd563ed3d9dc02e01fbf3dd301c94c33d6d273 (diff) | |
parent | 5324565457e38c48b8a9f169b8ab94627dc6c979 (diff) | |
download | gitpython-9debf6b0aafb6f7781ea9d1383c86939a1aacde3.tar.gz |
Merge pull request #405 from nvie/master
Make sure .read() and friends always return bytes
Diffstat (limited to 'git/cmd.py')
-rw-r--r-- | git/cmd.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -355,7 +355,7 @@ class Git(LazyMixin): def read(self, size=-1): bytes_left = self._size - self._nbr if bytes_left == 0: - return '' + return b'' if size > -1: # assure we don't try to read past our limit size = min(bytes_left, size) @@ -374,7 +374,7 @@ class Git(LazyMixin): def readline(self, size=-1): if self._nbr == self._size: - return '' + return b'' # clamp size to lowest allowed value bytes_left = self._size - self._nbr |