mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
This commit is contained in:
Antoine Pitrou 2015-03-10 22:32:00 +01:00
parent ebb8c2d528
commit a654510150
6 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/bytesobject.c
View file

@ -2370,18 +2370,6 @@ bytes_fromhex(PyObject *cls, PyObject *args)
return NULL;
}
PyDoc_STRVAR(sizeof__doc__,
"B.__sizeof__() -> size of B in memory, in bytes");
static PyObject *
bytes_sizeof(PyBytesObject *v)
{
Py_ssize_t res;
res = PyBytesObject_SIZE + Py_SIZE(v) * Py_TYPE(v)->tp_itemsize;
return PyLong_FromSsize_t(res);
}
static PyObject *
bytes_getnewargs(PyBytesObject *v)
{
@ -2447,8 +2435,6 @@ bytes_methods[] = {
translate__doc__},
{"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
{"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__},
{"__sizeof__", (PyCFunction)bytes_sizeof, METH_NOARGS,
sizeof__doc__},
{NULL, NULL} /* sentinel */
};

12
Objects/tupleobject.c
View file

@ -759,27 +759,15 @@ tuple_getnewargs(PyTupleObject *v)
}
static PyObject *
tuple_sizeof(PyTupleObject *self)
{
Py_ssize_t res;
res = PyTuple_Type.tp_basicsize + Py_SIZE(self) * sizeof(PyObject *);
return PyLong_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 */

2
Objects/typeobject.c
View file

@ -4258,7 +4258,7 @@ object_sizeof(PyObject *self, PyObject *args)
res = 0;
isize = self->ob_type->tp_itemsize;
if (isize > 0)
res = Py_SIZE(self->ob_type) * isize;
res = Py_SIZE(self) * isize;
res += self->ob_type->tp_basicsize;
return PyLong_FromSsize_t(res);