import io, math, os
from bup import _helpers, compat, helpers
-from bup.compat import buffer_concat
+from bup.compat import buffer, join_bytes
from bup.helpers import sc_page_size
-if compat.py_maj > 2:
- from bup.compat import buffer, buffer_concat
-
_fmincore = getattr(helpers, 'fmincore', None)
def put(self, s):
if s:
- self.data = buffer_concat(buffer(self.data, self.start), s)
+ self.data = join_bytes(buffer(self.data, self.start), s)
self.start = 0
def peek(self, count):
self.start += count
def get(self, count):
- v = buffer(self.data, self.start, count)
+ if count <= 256:
+ v = self.data[self.start : self.start + count]
+ else:
+ v = buffer(self.data, self.start, count)
self.start += count
return v
ofs = 0
l = list(l)
total = sum(size for mode,sha,size, in l)
- vlen = len('%x' % total)
+ vlen = len(b'%x' % total)
shalist = []
for (mode, sha, size) in l:
- shalist.append((mode, '%0*x' % (vlen,ofs), sha))
+ shalist.append((mode, b'%0*x' % (vlen,ofs), sha))
ofs += size
assert(ofs == total)
return (shalist, total)
if len(shalist) == 1:
return (shalist[0][0], shalist[0][2])
elif len(shalist) == 0:
- return (GIT_MODE_FILE, makeblob(''))
+ return (GIT_MODE_FILE, makeblob(b''))
else:
return (GIT_MODE_TREE, maketree(shalist))