diff options
| -rw-r--r-- | Lib/test/test_deque.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_collectionsmodule.c | 21 |
3 files changed, 39 insertions, 1 deletions
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index 24125cd..a8487d2 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -7,6 +7,7 @@ import copy import pickle from io import StringIO import random +import struct BIG = 100000 @@ -531,6 +532,21 @@ class TestBasic(unittest.TestCase): gc.collect() self.assertTrue(ref() is None, "Cycle was not collected") + check_sizeof = support.check_sizeof + + @support.cpython_only + def test_sizeof(self): + BLOCKLEN = 62 + basesize = support.calcobjsize('2P4nlP') + blocksize = struct.calcsize('2P%dP' % BLOCKLEN) + self.assertEqual(object.__sizeof__(deque()), basesize) + check = self.check_sizeof + check(deque(), basesize + blocksize) + check(deque('a'), basesize + blocksize) + check(deque('a' * (BLOCKLEN // 2)), basesize + blocksize) + check(deque('a' * (BLOCKLEN // 2 + 1)), basesize + 2 * blocksize) + check(deque('a' * (42 * BLOCKLEN)), basesize + 43 * blocksize) + class TestVariousIteratorArgs(unittest.TestCase): def test_constructor(self): @@ -370,6 +370,9 @@ Library - Issue #15512: Add a __sizeof__ implementation for parser. Patch by Serhiy Storchaka. +- Issue #15469: Add a __sizeof__ implementation for deque objects. + Patch by Serhiy Storchaka. + - Issue #15489: Add a __sizeof__ implementation for BytesIO objects. Patch by Serhiy Storchaka. diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 302f4e3..d6899c2 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -933,6 +933,23 @@ deque_init(dequeobject *deque, PyObject *args, PyObject *kwdargs) } static PyObject * +deque_sizeof(dequeobject *deque, void *unused) +{ + Py_ssize_t res; + Py_ssize_t blocks; + + res = sizeof(dequeobject); + blocks = (deque->leftindex + deque->len + BLOCKLEN - 1) / BLOCKLEN; + assert(deque->leftindex + deque->len - 1 == + (blocks - 1) * BLOCKLEN + deque->rightindex); + res += blocks * sizeof(block); + return PyLong_FromSsize_t(res); +} + +PyDoc_STRVAR(sizeof_doc, +"D.__sizeof__() -- size of D in memory, in bytes"); + +static PyObject * deque_get_maxlen(dequeobject *deque) { if (deque->maxlen == -1) @@ -995,7 +1012,9 @@ static PyMethodDef deque_methods[] = { {"reverse", (PyCFunction)deque_reverse, METH_NOARGS, reverse_doc}, {"rotate", (PyCFunction)deque_rotate, - METH_VARARGS, rotate_doc}, + METH_VARARGS, rotate_doc}, + {"__sizeof__", (PyCFunction)deque_sizeof, + METH_NOARGS, sizeof_doc}, {NULL, NULL} /* sentinel */ }; |