diff -r fa95b04e67fd Lib/test/test_deque.py --- a/Lib/test/test_deque.py Sun Jul 29 16:30:50 2012 +0200 +++ b/Lib/test/test_deque.py Sun Jul 29 22:11:52 2012 +0300 @@ -6,6 +6,7 @@ import copy import cPickle as pickle import random +import struct BIG = 100000 @@ -517,6 +518,21 @@ gc.collect() self.assertTrue(ref() is None, "Cycle was not collected") + check_sizeof = test_support.check_sizeof + + @test_support.cpython_only + def test_sizeof(self): + BLOCKLEN = 62 + basesize = test_support.calcobjsize('2P4PlP') + 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): diff -r fa95b04e67fd Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c Sun Jul 29 16:30:50 2012 +0200 +++ b/Modules/_collectionsmodule.c Sun Jul 29 22:11:52 2012 +0300 @@ -991,6 +991,23 @@ } 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) @@ -1053,7 +1070,9 @@ {"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 */ };