diff options
| author | Robert Schuppenies <okkotonushi@googlemail.com> | 2008-06-13 13:29:37 (GMT) |
|---|---|---|
| committer | Robert Schuppenies <okkotonushi@googlemail.com> | 2008-06-13 13:29:37 (GMT) |
| commit | 73e9ffc811f71172ea17ea96cdc4bb1b74b58b47 (patch) | |
| tree | 373044cb89757dd8167b534719a35225f32cf9af | |
| parent | 60c0be3acd5ba11392bb4dac4baf97aad1eebde3 (diff) | |
| download | cpython-73e9ffc811f71172ea17ea96cdc4bb1b74b58b47.zip cpython-73e9ffc811f71172ea17ea96cdc4bb1b74b58b47.tar.gz cpython-73e9ffc811f71172ea17ea96cdc4bb1b74b58b47.tar.bz2 | |
Fixed: sys.getsizeof does not take the actual length of the tuples into account.
| -rw-r--r-- | Lib/test/test_sys.py | 3 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 4563374..2062838 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -567,6 +567,9 @@ class SizeofTest(unittest.TestCase): # string self.check_sizeof('', h + l + self.align(i + 1)) 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(): diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index e9cb3ef..79d7553 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -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, "T.index(value, [start, [stop]]) -> integer -- return first index of value"); 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 */ |