summaryrefslogtreecommitdiff
path: root/git/test/test_repo.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/test/test_repo.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/test/test_repo.py')
-rw-r--r--git/test/test_repo.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 5035cbb9..177aa176 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -454,7 +454,7 @@ class TestRepo(TestBase):
assert s.readline() == l1
assert s.readline() == l2
assert s.readline() == l3
- assert s.readline() == ''
+ assert s.readline() == b''
assert s._stream.tell() == len(d)
# readline limit
@@ -465,13 +465,13 @@ class TestRepo(TestBase):
# readline on tiny section
s = mktiny()
assert s.readline() == l1p
- assert s.readline() == ''
+ assert s.readline() == b''
assert s._stream.tell() == ts + 1
# read no limit
s = mkfull()
assert s.read() == d[:-1]
- assert s.read() == ''
+ assert s.read() == b''
assert s._stream.tell() == len(d)
# read limit