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

Fixed Issue3122 and extended sys.getsizeof tests for built-in types.

Browse source
This commit is contained in:
Robert Schuppenies 2008-07-10 13:43:26 +00:00
parent 548db58e02
commit d2cd86ddd5
2 changed files with 182 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/sysmodule.c
View file

@ -651,8 +651,15 @@ sys_getsizeof(PyObject *self, PyObject *args)
return NULL;
}
/* Type objects */
if (PyType_Check(args)){
/* Make sure the type is initialized. float gets initialized late */
if (PyType_Ready(Py_TYPE(args)) < 0)
return NULL;
/* Instance of old-style class */
if (PyInstance_Check(args))
return PyInt_FromSsize_t(PyInstance_Type.tp_basicsize);
/* all other objects */
else {
PyObject *method = _PyType_Lookup(Py_TYPE(args),
str__sizeof__);
if (method == NULL) {
@ -662,15 +669,7 @@ sys_getsizeof(PyObject *self, PyObject *args)
return NULL;
}
return PyObject_CallFunctionObjArgs(method, args, NULL);
}
/* Instance of old-style classes */
else if (PyInstance_Check(args))
return PyInt_FromSsize_t(PyInstance_Type.tp_basicsize);
/* Old-style classes */
else if (PyClass_Check(args))
return PyInt_FromSsize_t(PyClass_Type.tp_basicsize);
else
return PyObject_CallMethod(args, "__sizeof__", NULL);
}
}
PyDoc_STRVAR(getsizeof_doc,