diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-12-19 18:07:11 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-12-19 18:07:11 (GMT) |
commit | a9406e77fa7bd3618c16edd248c24010af7035c1 (patch) | |
tree | 885dac8e53616cebafbb37bc5613040513bd9581 /Modules/itertoolsmodule.c | |
parent | a254921cd4c1ca22d725872601292c48b7caa20a (diff) | |
parent | 5c4064e8bd199d70eefd7ec24766957c22f1b8e8 (diff) | |
download | cpython-a9406e77fa7bd3618c16edd248c24010af7035c1.zip cpython-a9406e77fa7bd3618c16edd248c24010af7035c1.tar.gz cpython-a9406e77fa7bd3618c16edd248c24010af7035c1.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/itertoolsmodule.c')
-rw-r--r-- | Modules/itertoolsmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 2e7cc4f..0c6daa1 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2109,7 +2109,7 @@ product_sizeof(productobject *lz, void *unused) { Py_ssize_t res; - res = sizeof(productobject); + res = _PyObject_SIZE(Py_TYPE(lz)); res += PyTuple_GET_SIZE(lz->pools) * sizeof(Py_ssize_t); return PyLong_FromSsize_t(res); } @@ -2440,7 +2440,7 @@ combinations_sizeof(combinationsobject *co, void *unused) { Py_ssize_t res; - res = sizeof(combinationsobject); + res = _PyObject_SIZE(Py_TYPE(co)); res += co->r * sizeof(Py_ssize_t); return PyLong_FromSsize_t(res); } @@ -2781,7 +2781,7 @@ cwr_sizeof(cwrobject *co, void *unused) { Py_ssize_t res; - res = sizeof(cwrobject); + res = _PyObject_SIZE(Py_TYPE(co)); res += co->r * sizeof(Py_ssize_t); return PyLong_FromSsize_t(res); } @@ -3129,7 +3129,7 @@ permutations_sizeof(permutationsobject *po, void *unused) { Py_ssize_t res; - res = sizeof(permutationsobject); + res = _PyObject_SIZE(Py_TYPE(po)); res += PyTuple_GET_SIZE(po->pool) * sizeof(Py_ssize_t); res += po->r * sizeof(Py_ssize_t); return PyLong_FromSsize_t(res); |