diff options
| author | Harmon <Harmon758@gmail.com> | 2020-02-16 07:54:24 -0600 |
|---|---|---|
| committer | Harmon <Harmon758@gmail.com> | 2020-02-16 07:55:44 -0600 |
| commit | 59c053ee05d6e5f50f8699260aa0e362b567c033 (patch) | |
| tree | 2b8061f658c1181077df76db58aac8415aeb5d7d /gitdb | |
| parent | d1c20d559a1f264dad12d1033a052ffc1c159260 (diff) | |
| download | gitdb-59c053ee05d6e5f50f8699260aa0e362b567c033.tar.gz | |
Remove and replace compat.to_bytes
Diffstat (limited to 'gitdb')
| -rw-r--r-- | gitdb/pack.py | 7 | ||||
| -rw-r--r-- | gitdb/utils/compat.py | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/gitdb/pack.py b/gitdb/pack.py index 68da2b7..a38468e 100644 --- a/gitdb/pack.py +++ b/gitdb/pack.py @@ -62,7 +62,6 @@ from struct import pack from binascii import crc32 from gitdb.const import NULL_BYTE -from gitdb.utils.compat import to_bytes import tempfile import array @@ -877,7 +876,11 @@ class PackEntity(LazyMixin): stream = streams[-1] while stream.type_id in delta_types: if stream.type_id == REF_DELTA: - sindex = self._index.sha_to_index(to_bytes(stream.delta_info)) + # smmap can return memory view objects, which can't be compared as buffers/bytes can ... + if isinstance(stream.delta_info, memoryview): + sindex = self._index.sha_to_index(stream.delta_info.tobytes()) + else: + sindex = self._index.sha_to_index(stream.delta_info) if sindex is None: break stream = self._pack.stream(self._index.offset(sindex)) diff --git a/gitdb/utils/compat.py b/gitdb/utils/compat.py index d5791ed..6909c53 100644 --- a/gitdb/utils/compat.py +++ b/gitdb/utils/compat.py @@ -3,17 +3,6 @@ import sys PY3 = sys.version_info[0] == 3 try: - # Python 2 - def to_bytes(i): - return i -except NameError: - # smmap can return memory view objects, which can't be compared as buffers/bytes can ... - def to_bytes(i): - if isinstance(i, memoryview): - return i.tobytes() - return i - -try: MAXSIZE = sys.maxint except AttributeError: MAXSIZE = sys.maxsize |