changeset: 78255:dbe7f39ff341 branch: 2.7 parent: 78252:3921d3c71e64 user: Meador Inge date: Mon Jul 23 09:27:00 2012 -0500 files: Lib/test/test_struct.py Misc/NEWS Modules/_struct.c description: Issue #15402: Add a __sizeof__ method to struct.Struct. Initial patch by Serhiy Storchaka. diff -r 3921d3c71e64 -r dbe7f39ff341 Lib/test/test_struct.py --- a/Lib/test/test_struct.py Sun Jul 22 19:36:03 2012 -0700 +++ b/Lib/test/test_struct.py Mon Jul 23 09:27:00 2012 -0500 @@ -544,6 +544,16 @@ hugecount2 = '{}b{}H'.format(sys.maxsize//2, sys.maxsize//2) self.assertRaises(struct.error, struct.calcsize, hugecount2) + def test_sizeof(self): + self.assertGreater(sys.getsizeof(struct.Struct('BHILfdspP')), + sys.getsizeof(struct.Struct('B'))) + self.assertGreaterEqual(sys.getsizeof(struct.Struct('123B')), + sys.getsizeof(struct.Struct('B'))) + self.assertGreaterEqual(sys.getsizeof(struct.Struct('B' * 123)), + sys.getsizeof(struct.Struct('123B'))) + self.assertGreaterEqual(sys.getsizeof(struct.Struct('123xB')), + sys.getsizeof(struct.Struct('B'))) + def test_main(): run_unittest(StructTest) diff -r 3921d3c71e64 -r dbe7f39ff341 Misc/NEWS --- a/Misc/NEWS Sun Jul 22 19:36:03 2012 -0700 +++ b/Misc/NEWS Mon Jul 23 09:27:00 2012 -0500 @@ -90,6 +90,10 @@ Library ------- +- Issue #15402: An issue in the struct module that caused sys.getsizeof to + return incorrect results for struct.Struct instances has been fixed. + Initial patch by Serhiy Storchaka. + - Issue #15232: when mangle_from is True, email.Generator now correctly mangles lines that start with 'From' that occur in a MIME preamble or epilog. diff -r 3921d3c71e64 -r dbe7f39ff341 Modules/_struct.c --- a/Modules/_struct.c Sun Jul 22 19:36:03 2012 -0700 +++ b/Modules/_struct.c Mon Jul 23 09:27:00 2012 -0500 @@ -1693,6 +1693,22 @@ return PyInt_FromSsize_t(self->s_size); } +PyDoc_STRVAR(s_sizeof__doc__, +"S.__sizeof__() -> size of S in memory, in bytes"); + +static PyObject * +s_sizeof(PyStructObject *self) +{ + Py_ssize_t size; + formatcode *code; + + size = sizeof(PyStructObject) + sizeof(formatcode); + for (code = self->s_codes; code->fmtdef != NULL; code++) { + size += sizeof(formatcode); + } + return PyLong_FromSsize_t(size); +} + /* List of functions */ static struct PyMethodDef s_methods[] = { @@ -1701,6 +1717,7 @@ {"unpack", s_unpack, METH_O, s_unpack__doc__}, {"unpack_from", (PyCFunction)s_unpack_from, METH_VARARGS|METH_KEYWORDS, s_unpack_from__doc__}, + {"__sizeof__", (PyCFunction)s_sizeof, METH_NOARGS, s_sizeof__doc__}, {NULL, NULL} /* sentinel */ };