[pypy-svn] pypy default: All usages of memoryview().suboffsets I've seen return None.

amauryfa commits-noreply at bitbucket.org
Thu Jan 27 19:27:34 CET 2011


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41404:09f78e9aca65
Date: 2011-01-27 18:49 +0100
http://bitbucket.org/pypy/pypy/changeset/09f78e9aca65/

Log:	All usages of memoryview().suboffsets I've seen return None. maybe
	py3k will have a different opinion.

diff --git a/pypy/module/__builtin__/test/test_buffer.py b/pypy/module/__builtin__/test/test_buffer.py
--- a/pypy/module/__builtin__/test/test_buffer.py
+++ b/pypy/module/__builtin__/test/test_buffer.py
@@ -205,7 +205,7 @@
 
     def test_suboffsets(self):
         v = memoryview("a"*100)
-        assert v.suboffsets == (0,)
+        assert v.suboffsets == None
         v = memoryview(buffer("a"*100, 2))
         assert v.shape == (98,)
         assert v.suboffsets == (2,)

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
@@ -114,14 +114,8 @@
     def w_get_strides(space, self):
         return space.newtuple([space.wrap(1)])
     def w_get_suboffsets(space, self):
-        buf = self.buf
-        if isinstance(buf, buffer.SubBuffer):
-            offset = buf.offset
-        elif isinstance(buf, buffer.RWSubBuffer):
-            offset = buf.offset
-        else:
-            offset = 0
-        return space.newtuple([space.wrap(offset)])
+        # I've never seen anyone filling this field
+        return space.w_None
 
 
 @unwrap_spec(ObjSpace, W_Root, W_Root)


More information about the Pypy-commit mailing list