Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: PyBuffer
Changeset: r90893:d7d49f4a1803
Date: 2017-04-01 16:22 +0100
http://bitbucket.org/pypy/pypy/changeset/d7d49f4a1803/
Log: Remove BinaryBuffer API from Buffer: getitem(), setitem(),
getslice(), setslice()
diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -15,23 +15,6 @@
"Returns an interp-level string with the whole content of the buffer."
return ''.join(self._copy_buffer())
- def getitem(self, index):
- "Returns the index'th character in the buffer."
- raise NotImplementedError # Must be overriden. No bounds checks.
-
- def getslice(self, start, stop, step, size):
- # May be overridden. No bounds checks.
- return ''.join([self.getitem(i) for i in range(start, stop, step)])
-
- def setitem(self, index, char):
- "Write a character into the buffer."
- raise NotImplementedError # Must be overriden. No bounds checks.
-
- def setslice(self, start, string):
- # May be overridden. No bounds checks.
- for i in range(len(string)):
- self.setitem(start + i, string[i])
-
def get_raw_address(self):
raise ValueError("no raw buffer")
@@ -109,12 +92,6 @@
def as_str(self):
return self.data.as_str()
- def getitem(self, index):
- return self.data.getitem(index)
-
- def setitem(self, index, value):
- return self.data.setitem(index, value)
-
def get_raw_address(self):
return self.data.get_raw_address()
@@ -237,7 +214,7 @@
if start == 0 and stop == len(self.value):
return self.value
return self.value[start:stop]
- return Buffer.getslice(self, start, stop, step, size)
+ return BinaryBuffer.getslice(self, start, stop, step, size)
def get_raw_address(self):
from rpython.rtyper.lltypesystem import rffi
diff --git a/pypy/objspace/std/memoryobject.py
b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -695,25 +695,6 @@
def getlength(self):
return self.shape[0] * self.getitemsize()
- def getitem(self, index):
- return self.buf.getitem(self.offset + index)
-
- def setitem(self, index, char):
- self.buf.setitem(self.offset + index, char)
-
- def getslice(self, start, stop, step, size):
- if start == stop:
- return '' # otherwise, adding self.offset might make them
- # out of bounds
- return self.buf.getslice(self.offset + start, self.offset + stop,
- step, size)
-
- def setslice(self, start, string):
- if len(string) == 0:
- return # otherwise, adding self.offset might make 'start'
- # out of bounds
- self.buf.setslice(self.offset + start, string)
-
def get_raw_address(self):
from rpython.rtyper.lltypesystem import rffi
ptr = self.buf.get_raw_address()
@@ -748,18 +729,6 @@
def as_str_and_offset_maybe(self):
return self.parent.as_str_and_offset_maybe()
- def getitem(self, index):
- return self.parent.getitem(index)
-
- def setitem(self, index, value):
- return self.parent.setitem(index, value)
-
- def getslice(self, start, stop, step, size):
- return self.parent.getslice(start, stop, step, size)
-
- def setslice(self, start, string):
- self.parent.setslice(start, string)
-
def get_raw_address(self):
return self.parent.get_raw_address()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
