From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 10 Mar 2015 21:35:24 +0000 (+0100)
Subject: Issue #23629: Fix the default __sizeof__ implementation for variable-sized objects.
X-Git-Tag: v3.5.0a3~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63afdaa1105de24e87658e82de314a37d341f02b;p=python

Issue #23629: Fix the default __sizeof__ implementation for variable-sized objects.
---

63afdaa1105de24e87658e82de314a37d341f02b
diff --cc Lib/test/test_buffer.py
index 0976fa9e34,e84f3e4e26..d921a5aacc
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@@ -2462,6 -2449,21 +2462,21 @@@ class TestBufferProtocol(unittest.TestC
              self.assertEqual(m.tobytes(), b'')
              self.assertEqual(m.tolist(), [])
  
+     check_sizeof = support.check_sizeof
+ 
+     def test_memoryview_sizeof(self):
+         check = self.check_sizeof
+         vsize = support.calcvobjsize
 -        base_struct = 'Pnin 2P2n2i5P 3cP'
++        base_struct = 'Pnin 2P2n2i5P P'
+         per_dim = '3n'
+ 
+         items = list(range(8))
+         check(memoryview(b''), vsize(base_struct + 1 * per_dim))
+         a = ndarray(items, shape=[2, 4], format="b")
+         check(memoryview(a), vsize(base_struct + 2 * per_dim))
+         a = ndarray(items, shape=[2, 2, 2], format="b")
+         check(memoryview(a), vsize(base_struct + 3 * per_dim))
+ 
      def test_memoryview_struct_module(self):
  
          class INT(object):
diff --cc Objects/bytesobject.c
index b015974f7c,b9b49acebe..2ceba486f0
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -3556,10 -2431,10 +3520,9 @@@ bytes_methods[] = 
      {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS,
       _Py_swapcase__doc__},
      {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__},
 -    {"translate", (PyCFunction)bytes_translate, METH_VARARGS,
 -     translate__doc__},
 +    BYTES_TRANSLATE_METHODDEF
      {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
      {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__},
-     BYTES_SIZEOF_METHODDEF
      {NULL,     NULL}                         /* sentinel */
  };