Remove and replace compat.buffer

Author: Harmon758

gitdb/fun.py

@@ -16,7 +16,7 @@
 
 from gitdb.const import NULL_BYTE, BYTE_SPACE
 from gitdb.utils.encoding import force_text
-from gitdb.utils.compat import buffer, PY3
+from gitdb.utils.compat import PY3
 from gitdb.typ import (
     str_blob_type,
     str_commit_type,
@@ -101,7 +101,7 @@ def delta_chunk_apply(dc, bbuf, write):
     :param write: write method to call with data to write"""
     if dc.data is None:
         # COPY DATA FROM SOURCE
-        write(buffer(bbuf, dc.so, dc.ts))
+        write(bbuf[dc.so:dc.so + dc.ts])
     else:
         # APPEND DATA
         # whats faster: if + 4 function calls or just a write with a slice ?
@@ -698,7 +698,7 @@ def apply_delta_data(src_buf, src_buf_size, delta_buf, delta_buf_size, write):
                 if (rbound < cp_size or
                         rbound > src_buf_size):
                     break
-                write(buffer(src_buf, cp_off, cp_size))
+                write(src_buf[cp_off:cp_off + cp_size])
             elif c:
                 write(db[i:i + c])
                 i += c
@@ -741,7 +741,7 @@ def apply_delta_data(src_buf, src_buf_size, delta_buf, delta_buf_size, write):
                 if (rbound < cp_size or
                         rbound > src_buf_size):
                     break
-                write(buffer(src_buf, cp_off, cp_size))
+                write(src_buf[cp_off:cp_off + cp_size])
             elif c:
                 write(db[i:i + c])
                 i += c

gitdb/pack.py

@@ -62,10 +62,7 @@
 from binascii import crc32
 
 from gitdb.const import NULL_BYTE
-from gitdb.utils.compat import (
-    buffer, 
-    to_bytes
-)
+from gitdb.utils.compat import to_bytes
 
 import tempfile
 import array
@@ -117,7 +114,7 @@ def pack_object_at(cursor, offset, as_stream):
     # END handle type id
     abs_data_offset = offset + total_rela_offset
     if as_stream:
-        stream = DecompressMemMapReader(buffer(data, total_rela_offset), False, uncomp_size)
+        stream = DecompressMemMapReader(data[total_rela_offset:], False, uncomp_size)
         if delta_info is None:
             return abs_data_offset, OPackStream(offset, type_id, uncomp_size, stream)
         else:
@@ -408,7 +405,7 @@ def offsets(self):
         if self._version == 2:
             # read stream to array, convert to tuple
             a = array.array('I')    # 4 byte unsigned int, long are 8 byte on 64 bit it appears
-            a.frombytes(buffer(self._cursor.map(), self._pack_offset, self._pack_64_offset - self._pack_offset))
+            a.frombytes(self._cursor.map()[self._pack_offset:self._pack_64_offset])
 
             # networkbyteorder to something array likes more
             if sys.byteorder == 'little':
@@ -836,7 +833,7 @@ def is_valid_stream(self, sha, use_crc=False):
             while cur_pos < next_offset:
                 rbound = min(cur_pos + chunk_size, next_offset)
                 size = rbound - cur_pos
-                this_crc_value = crc_update(buffer(pack_data, cur_pos, size), this_crc_value)
+                this_crc_value = crc_update(pack_data[cur_pos:cur_pos + size], this_crc_value)
                 cur_pos += size
             # END window size loop
 

gitdb/stream.py

@@ -27,7 +27,6 @@
 )
 
 from gitdb.const import NULL_BYTE, BYTE_SPACE
-from gitdb.utils.compat import buffer
 from gitdb.utils.encoding import force_bytes
 
 has_perf_mod = False
@@ -278,7 +277,7 @@ def read(self, size=-1):
         # END adjust winsize
 
         # takes a slice, but doesn't copy the data, it says ...
-        indata = buffer(self._m, self._cws, self._cwe - self._cws)
+        indata = self._m[self._cws:self._cwe]
 
         # get the actual window end to be sure we don't use it for computations
         self._cwe = self._cws + len(indata)
@@ -414,7 +413,7 @@ def _set_cache_brute_(self, attr):
             buf = dstream.read(512)         # read the header information + X
             offset, src_size = msb_size(buf)
             offset, target_size = msb_size(buf, offset)
-            buffer_info_list.append((buffer(buf, offset), offset, src_size, target_size))
+            buffer_info_list.append((buf[offset:], offset, src_size, target_size))
             max_target_size = max(max_target_size, target_size)
         # END for each delta stream
 

gitdb/utils/compat.py

@@ -4,22 +4,12 @@
 
 try:
     # Python 2
-    buffer = buffer
     memoryview = buffer
     # Assume no memory view ...
     def to_bytes(i):
         return i
 except NameError:
     # Python 3 has no `buffer`; only `memoryview`
-    # However, it's faster to just slice the object directly, maybe it keeps a view internally
-    def buffer(obj, offset, size=None):
-        if size is None:
-            # return memoryview(obj)[offset:]
-            return obj[offset:]
-        else:
-            # return memoryview(obj)[offset:offset+size]
-            return obj[offset:offset + size]
-    # end buffer reimplementation
     # smmap can return memory view objects, which can't be compared as buffers/bytes can ... 
     def to_bytes(i):
         if isinstance(i, memoryview):