mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 03:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

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

Browse source
This commit is contained in:
Antoine Pitrou 2015-03-10 22:35:24 +01:00
commit 63afdaa110
6 changed files with 22 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Objects/bytesobject.c
View file

@ -3463,42 +3463,6 @@ bytes_fromhex_impl(PyTypeObject *type, PyObject *string)
return NULL;
}
/*[clinic input]
bytes.__sizeof__ as bytes_sizeof
self: self(type="PyBytesObject *")
Returns the size of the bytes object in memory, in bytes.
[clinic start generated code]*/
PyDoc_STRVAR(bytes_sizeof__doc__,
"__sizeof__($self, /)\n"
"--\n"
"\n"
"Returns the size of the bytes object in memory, in bytes.");
#define BYTES_SIZEOF_METHODDEF \
{"__sizeof__", (PyCFunction)bytes_sizeof, METH_NOARGS, bytes_sizeof__doc__},
static PyObject *
bytes_sizeof_impl(PyBytesObject *self);
static PyObject *
bytes_sizeof(PyBytesObject *self, PyObject *Py_UNUSED(ignored))
{
return bytes_sizeof_impl(self);
}
static PyObject *
bytes_sizeof_impl(PyBytesObject *self)
/*[clinic end generated code: output=44933279343f24ae input=bee4c64bb42078ed]*/
{
Py_ssize_t res;
res = PyBytesObject_SIZE + Py_SIZE(self) * Py_TYPE(self)->tp_itemsize;
return PyLong_FromSsize_t(res);
}
static PyObject *
bytes_getnewargs(PyBytesObject *v)
{
@ -3559,7 +3523,6 @@ bytes_methods[] = {
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 */
};

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

@ -4276,7 +4276,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);