diff options
| author | Kevin Brown <kevin@kevinbrown.in> | 2014-07-13 20:14:24 -0400 |
|---|---|---|
| committer | Kevin Brown <kevin@kevinbrown.in> | 2014-07-13 20:14:24 -0400 |
| commit | f0b3e7bcc5278208294f40aa580ccb378ed1c165 (patch) | |
| tree | 07aa69893c8671f57572cf32d737d02456bbcec6 /gitdb | |
| parent | d8405ee00bfc1ebdae7c41b45f8c374902a3d2b4 (diff) | |
| download | gitdb-f0b3e7bcc5278208294f40aa580ccb378ed1c165.tar.gz | |
Bytes for everyone!
Diffstat (limited to 'gitdb')
| -rw-r--r-- | gitdb/db/loose.py | 8 | ||||
| -rw-r--r-- | gitdb/stream.py | 2 | ||||
| -rw-r--r-- | gitdb/test/db/test_ref.py | 3 | ||||
| -rw-r--r-- | gitdb/test/test_stream.py | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/gitdb/db/loose.py b/gitdb/db/loose.py index ac1b9d1..6568416 100644 --- a/gitdb/db/loose.py +++ b/gitdb/db/loose.py @@ -16,10 +16,10 @@ from gitdb.exc import ( ) from gitdb.stream import ( - DecompressMemMapReader, - FDCompressedSha1Writer, - FDStream, - Sha1Writer + DecompressMemMapReader, + FDCompressedSha1Writer, + FDStream, + Sha1Writer ) from gitdb.base import ( diff --git a/gitdb/stream.py b/gitdb/stream.py index 75993db..1bd7fe2 100644 --- a/gitdb/stream.py +++ b/gitdb/stream.py @@ -551,7 +551,7 @@ class Sha1Writer(object): def write(self, data): """:raise IOError: If not all bytes could be written - :return: lenght of incoming data""" + :return: length of incoming data""" self.sha1.update(data) return len(data) diff --git a/gitdb/test/db/test_ref.py b/gitdb/test/db/test_ref.py index e303fe2..a1387ee 100644 --- a/gitdb/test/db/test_ref.py +++ b/gitdb/test/db/test_ref.py @@ -24,7 +24,7 @@ class TestReferenceDB(TestDBBase): @with_rw_directory def test_writing(self, path): - NULL_BIN_SHA = '\0' * 20 + NULL_BIN_SHA = '\0'.encode("ascii") * 20 alt_path = os.path.join(path, 'alternates') rdb = ReferenceDB(alt_path) @@ -35,7 +35,6 @@ class TestReferenceDB(TestDBBase): # try empty, non-existing assert not rdb.has_object(NULL_BIN_SHA) - # setup alternate file # add two, one is invalid own_repo_path = fixture_path('../../../.git/objects') # use own repo diff --git a/gitdb/test/test_stream.py b/gitdb/test/test_stream.py index f6eb371..f409f17 100644 --- a/gitdb/test/test_stream.py +++ b/gitdb/test/test_stream.py @@ -111,13 +111,13 @@ class TestStream(TestBase): def test_sha_writer(self): writer = Sha1Writer() - assert 2 == writer.write("hi") + assert 2 == writer.write("hi".encode("ascii")) assert len(writer.sha(as_hex=1)) == 40 assert len(writer.sha(as_hex=0)) == 20 # make sure it does something ;) prev_sha = writer.sha() - writer.write("hi again") + writer.write("hi again".encode("ascii")) assert writer.sha() != prev_sha def test_compressed_writer(self): |