Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r70061:9d175a0294eb
Date: 2014-03-18 14:56 -0400
http://bitbucket.org/pypy/pypy/changeset/9d175a0294eb/
Log: seems these do need to be unique, even in separate classes
diff --git a/pypy/module/__builtin__/interp_memoryview.py
b/pypy/module/__builtin__/interp_memoryview.py
--- a/pypy/module/__builtin__/interp_memoryview.py
+++ b/pypy/module/__builtin__/interp_memoryview.py
@@ -42,8 +42,9 @@
def buffer_w(self, space):
return self.buf
+ @staticmethod
@unwrap_spec(offset=int, size=int)
- def descr_new(space, w_subtype, w_object, offset=0, size=-1):
+ def descr_new_buffer(space, w_subtype, w_object, offset=0, size=-1):
if space.isinstance_w(w_object, space.w_unicode):
# unicode objects support the old buffer interface
# but not the new buffer interface (change in python 2.7)
@@ -144,7 +145,7 @@
start of the object (or at the specified offset). The slice will
extend to the end of the target object (or with the specified size).
""",
- __new__ = interp2app(W_Buffer.descr_new.im_func),
+ __new__ = interp2app(W_Buffer.descr_new_buffer),
__len__ = interp2app(W_Buffer.descr_len),
__getitem__ = interp2app(W_Buffer.descr_getitem),
__setitem__ = interp2app(W_Buffer.descr_setitem),
@@ -175,9 +176,9 @@
def buffer_w(self, space):
return self.buf
- def descr_new(space, w_subtype, w_object):
- w_memoryview = W_MemoryView(space.buffer_w(w_object))
- return w_memoryview
+ @staticmethod
+ def descr_new_memoryview(space, w_subtype, w_object):
+ return W_MemoryView(space.buffer_w(w_object))
def _make_descr__cmp(name):
def descr__cmp(self, space, w_other):
@@ -296,7 +297,7 @@
__doc__ = """\
Create a new memoryview object which references the given object.
""",
- __new__ = interp2app(W_MemoryView.descr_new.im_func),
+ __new__ = interp2app(W_MemoryView.descr_new_memoryview),
__eq__ = interp2app(W_MemoryView.descr_eq),
__ge__ = interp2app(W_MemoryView.descr_ge),
__getitem__ = interp2app(W_MemoryView.descr_getitem),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
