Skip to content

Commit f0b3e7b

Browse files
committed
Bytes for everyone!
1 parent d8405ee commit f0b3e7b

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

gitdb/db/loose.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
)
1717

1818
from gitdb.stream import (
19-
DecompressMemMapReader,
20-
FDCompressedSha1Writer,
21-
FDStream,
22-
Sha1Writer
19+
DecompressMemMapReader,
20+
FDCompressedSha1Writer,
21+
FDStream,
22+
Sha1Writer
2323
)
2424

2525
from gitdb.base import (

gitdb/stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ def __init__(self):
551551

552552
def write(self, data):
553553
""":raise IOError: If not all bytes could be written
554-
:return: lenght of incoming data"""
554+
:return: length of incoming data"""
555555
self.sha1.update(data)
556556
return len(data)
557557

gitdb/test/db/test_ref.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def make_alt_file(self, alt_path, alt_list):
2424

2525
@with_rw_directory
2626
def test_writing(self, path):
27-
NULL_BIN_SHA = '\0' * 20
27+
NULL_BIN_SHA = '\0'.encode("ascii") * 20
2828

2929
alt_path = os.path.join(path, 'alternates')
3030
rdb = ReferenceDB(alt_path)
@@ -35,7 +35,6 @@ def test_writing(self, path):
3535
# try empty, non-existing
3636
assert not rdb.has_object(NULL_BIN_SHA)
3737

38-
3938
# setup alternate file
4039
# add two, one is invalid
4140
own_repo_path = fixture_path('../../../.git/objects') # use own repo

gitdb/test/test_stream.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ def test_decompress_reader(self):
111111

112112
def test_sha_writer(self):
113113
writer = Sha1Writer()
114-
assert 2 == writer.write("hi")
114+
assert 2 == writer.write("hi".encode("ascii"))
115115
assert len(writer.sha(as_hex=1)) == 40
116116
assert len(writer.sha(as_hex=0)) == 20
117117

118118
# make sure it does something ;)
119119
prev_sha = writer.sha()
120-
writer.write("hi again")
120+
writer.write("hi again".encode("ascii"))
121121
assert writer.sha() != prev_sha
122122

123123
def test_compressed_writer(self):

0 commit comments

Comments
 (0)