summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-07-29 22:01:06 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-07-29 22:01:06 (GMT)
commit8f328d0c1d86096b3d4e5f1c1ac497663e197a0d (patch)
tree8673cc00da383533b00baf893913062390c7d95f
parent10f0c50a0bc9237d640cb7beb216d63f9ec2b3eb (diff)
downloadcpython-8f328d0c1d86096b3d4e5f1c1ac497663e197a0d.zip
cpython-8f328d0c1d86096b3d4e5f1c1ac497663e197a0d.tar.gz
cpython-8f328d0c1d86096b3d4e5f1c1ac497663e197a0d.tar.bz2
Issue #15489: Add a __sizeof__ implementation for BytesIO objects.
Patch by Serhiy Storchaka.
-rw-r--r--Lib/test/test_memoryio.py11
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_io/bytesio.c12
3 files changed, 26 insertions, 0 deletions
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 49ca44f..9248098 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -654,6 +654,17 @@ class CBytesIOTest(PyBytesIOTest):
memio.close()
self.assertRaises(ValueError, memio.__setstate__, (b"closed", 0, None))
+ check_sizeof = support.check_sizeof
+
+ @support.cpython_only
+ def test_sizeof(self):
+ basesize = support.calcobjsize('P2PP2PP')
+ check = self.check_sizeof
+ self.assertEqual(object.__sizeof__(io.BytesIO()), basesize)
+ check(io.BytesIO(), basesize )
+ check(io.BytesIO(b'a'), basesize + 1 + 1 )
+ check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
+
class CStringIOTest(PyStringIOTest):
ioclass = io.StringIO
diff --git a/Misc/NEWS b/Misc/NEWS
index 3e6b8f8..1b3d244 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@ Core and Builtins
Library
-------
+- Issue #15489: Add a __sizeof__ implementation for BytesIO objects.
+ Patch by Serhiy Storchaka.
+
- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects.
Patch by Serhiy Storchaka.
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index b40513f..03f4c7d 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -834,6 +834,17 @@ bytesio_init(bytesio *self, PyObject *args, PyObject *kwds)
return 0;
}
+static PyObject *
+bytesio_sizeof(bytesio *self, void *unused)
+{
+ Py_ssize_t res;
+
+ res = sizeof(bytesio);
+ if (self->buf)
+ res += self->buf_size;
+ return PyLong_FromSsize_t(res);
+}
+
static int
bytesio_traverse(bytesio *self, visitproc visit, void *arg)
{
@@ -876,6 +887,7 @@ static struct PyMethodDef bytesio_methods[] = {
{"truncate", (PyCFunction)bytesio_truncate, METH_VARARGS, truncate_doc},
{"__getstate__", (PyCFunction)bytesio_getstate, METH_NOARGS, NULL},
{"__setstate__", (PyCFunction)bytesio_setstate, METH_O, NULL},
+ {"__sizeof__", (PyCFunction)bytesio_sizeof, METH_NOARGS, NULL},
{NULL, NULL} /* sentinel */
};