summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-04-10 11:22:17 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-04-10 11:22:17 +0200
commit9debf6b0aafb6f7781ea9d1383c86939a1aacde3 (patch)
tree8a7ce747a4615770481013dc9a2cf944d02bf6db /git/cmd.py
parentdabd563ed3d9dc02e01fbf3dd301c94c33d6d273 (diff)
parent5324565457e38c48b8a9f169b8ab94627dc6c979 (diff)
downloadgitpython-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.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 2f900ae2..7bd94e4d 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -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