From ba5c74329dadfb685bb921407916ffbb2efb78cc Mon Sep 17 00:00:00 2001 From: Alexandre Vassalotti Date: Tue, 4 Aug 2009 23:19:13 +0000 Subject: [PATCH] Issue 5449: Fix io.BytesIO to not accept arbitrary keywords Patch contributed by Erick Tryzelaar. --- Lib/test/test_memoryio.py | 5 +++++ Modules/_io/bytesio.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 7dd1658ca47..6ab83282fef 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -461,6 +461,11 @@ class PyBytesIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase): self.assertEqual(memio.write(a), 10) self.assertEqual(memio.getvalue(), buf) + def test_issue5449(self): + buf = self.buftype("1234567890") + self.ioclass(initial_bytes=buf) + self.assertRaises(TypeError, self.ioclass, buf, foo=None) + class TextIOTestMixin: diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 7b56551e615..5ca878dc81d 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -759,9 +759,11 @@ bytesio_new(PyTypeObject *type, PyObject *args, PyObject *kwds) static int bytesio_init(bytesio *self, PyObject *args, PyObject *kwds) { + char *kwlist[] = {"initial_bytes", NULL}; PyObject *initvalue = NULL; - if (!PyArg_ParseTuple(args, "|O:BytesIO", &initvalue)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:BytesIO", kwlist, + &initvalue)) return -1; /* In case, __init__ is called multiple times. */