summaryrefslogtreecommitdiffstats
path: root/Modules/_pickle.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-12-19 18:05:25 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-12-19 18:05:25 (GMT)
commit5c4064e8bd199d70eefd7ec24766957c22f1b8e8 (patch)
treea38d9933d5ee0d72fbebba31f046686e678a2c3c /Modules/_pickle.c
parentefd7b34d7c4e401bbecb343da7c9506137a3b2fe (diff)
downloadcpython-5c4064e8bd199d70eefd7ec24766957c22f1b8e8.zip
cpython-5c4064e8bd199d70eefd7ec24766957c22f1b8e8.tar.gz
cpython-5c4064e8bd199d70eefd7ec24766957c22f1b8e8.tar.bz2
Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
This allows sys.getsize() to work correctly with their subclasses with __slots__ defined.
Diffstat (limited to 'Modules/_pickle.c')
-rw-r--r--Modules/_pickle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 41f1cd1..56bbd58 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4015,7 +4015,7 @@ _pickle_Pickler___sizeof___impl(PicklerObject *self)
{
Py_ssize_t res, s;
- res = sizeof(PicklerObject);
+ res = _PyObject_SIZE(Py_TYPE(self));
if (self->memo != NULL) {
res += sizeof(PyMemoTable);
res += self->memo->mt_allocated * sizeof(PyMemoEntry);
@@ -6418,7 +6418,7 @@ _pickle_Unpickler___sizeof___impl(UnpicklerObject *self)
{
Py_ssize_t res;
- res = sizeof(UnpicklerObject);
+ res = _PyObject_SIZE(Py_TYPE(self));
if (self->memo != NULL)
res += self->memo_size * sizeof(PyObject *);
if (self->marks != NULL)