mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: sys.getsizeof does not take the actual length of the tuples into account.

This commit is contained in:
Robert Schuppenies 2008-06-13 13:29:37 +00:00
parent 60c0be3acd
commit 73e9ffc811
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_sys.py
View File

@ -567,6 +567,9 @@ def test_specialtypes(self):
# string # string
self.check_sizeof('', h + l + self.align(i + 1)) self.check_sizeof('', h + l + self.align(i + 1))
self.check_sizeof('abc', h + l + self.align(i + 1) + 3) self.check_sizeof('abc', h + l + self.align(i + 1) + 3)
# tuple
self.check_sizeof((), h)
self.check_sizeof((1,2,3), h + 3*p)
def test_main(): def test_main():

12
Objects/tupleobject.c
View File

@ -708,13 +708,25 @@ 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 PyInt_FromSsize_t(res);
}
PyDoc_STRVAR(index_doc, PyDoc_STRVAR(index_doc,
"T.index(value, [start, [stop]]) -> integer -- return first index of value"); "T.index(value, [start, [stop]]) -> integer -- return first index of value");
PyDoc_STRVAR(count_doc, PyDoc_STRVAR(count_doc,
"T.count(value) -> integer -- return number of occurrences of value"); "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[] = { static PyMethodDef tuple_methods[] = {
{"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS}, {"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS},
{"__sizeof__", (PyCFunction)tuple_sizeof, METH_NOARGS, sizeof_doc},
{"index", (PyCFunction)tupleindex, METH_VARARGS, index_doc}, {"index", (PyCFunction)tupleindex, METH_VARARGS, index_doc},
{"count", (PyCFunction)tuplecount, METH_O, count_doc}, {"count", (PyCFunction)tuplecount, METH_O, count_doc},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */