changeset:   94939:dbd48b22b477
branch:      2.7
parent:      94933:7c4c4e43c452
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Tue Mar 10 22:32:00 2015 +0100
files:       Misc/NEWS Objects/tupleobject.c Objects/typeobject.c
description:
Issue #23629: Fix the default __sizeof__ implementation for variable-sized objects.


diff -r 7c4c4e43c452 -r dbd48b22b477 Misc/NEWS
--- a/Misc/NEWS	Tue Mar 10 13:19:17 2015 -0700
+++ b/Misc/NEWS	Tue Mar 10 22:32:00 2015 +0100
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
+  objects.
+
 - Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV.  Analysis
   and fix by Guido Vranken.
 
diff -r 7c4c4e43c452 -r dbd48b22b477 Objects/tupleobject.c
--- a/Objects/tupleobject.c	Tue Mar 10 13:19:17 2015 -0700
+++ b/Objects/tupleobject.c	Tue Mar 10 22:32:00 2015 +0100
@@ -761,27 +761,15 @@
 
 }
 
-static PyObject *
-tuple_sizeof(PyTupleObject *self)
-{
-    Py_ssize_t res;
-
-    res = PyTuple_Type.tp_basicsize + Py_SIZE(self) * sizeof(PyObject *);
-    return PyInt_FromSsize_t(res);
-}
-
 PyDoc_STRVAR(index_doc,
 "T.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
 "Raises ValueError if the value is not present."
 );
 PyDoc_STRVAR(count_doc,
 "T.count(value) -> integer -- return number of occurrences of value");
-PyDoc_STRVAR(sizeof_doc,
-"T.__sizeof__() -- size of T in memory, in bytes");
 
 static PyMethodDef tuple_methods[] = {
     {"__getnewargs__",          (PyCFunction)tuple_getnewargs,  METH_NOARGS},
-    {"__sizeof__",      (PyCFunction)tuple_sizeof, METH_NOARGS, sizeof_doc},
     {"index",           (PyCFunction)tupleindex,  METH_VARARGS, index_doc},
     {"count",           (PyCFunction)tuplecount,  METH_O, count_doc},
     {NULL,              NULL}           /* sentinel */
diff -r 7c4c4e43c452 -r dbd48b22b477 Objects/typeobject.c
--- a/Objects/typeobject.c	Tue Mar 10 13:19:17 2015 -0700
+++ b/Objects/typeobject.c	Tue Mar 10 22:32:00 2015 +0100
@@ -3507,7 +3507,7 @@
     res = 0;
     isize = self->ob_type->tp_itemsize;
     if (isize > 0)
-        res = self->ob_type->ob_size * isize;
+        res = Py_SIZE(self) * isize;
     res += self->ob_type->tp_basicsize;
 
     return PyInt_FromSsize_t(res);