summaryrefslogtreecommitdiffstats
path: root/Modules/_io/bytesio.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 08:35:19 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 08:35:19 (GMT)
commit97b28f843718db2e111e8288e4fb7d183ddff58a (patch)
tree479e550b8906b5d001ad68ac116291edd5f83588 /Modules/_io/bytesio.c
parentc5605dffdb226e85f415bd6edb441dad714fbc0c (diff)
downloadcpython-97b28f843718db2e111e8288e4fb7d183ddff58a.zip
cpython-97b28f843718db2e111e8288e4fb7d183ddff58a.tar.gz
cpython-97b28f843718db2e111e8288e4fb7d183ddff58a.tar.bz2
Merged revisions 74316,74335 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r74316 | alexandre.vassalotti | 2009-08-05 01:19:13 +0200 (Mi, 05 Aug 2009) | 4 lines Issue 5449: Fix io.BytesIO to not accept arbitrary keywords Patch contributed by Erick Tryzelaar. ........ r74335 | philip.jenvey | 2009-08-06 22:00:08 +0200 (Do, 06 Aug 2009) | 1 line typo ........
Diffstat (limited to 'Modules/_io/bytesio.c')
-rw-r--r--Modules/_io/bytesio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index 7675846..cafe4a2 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -642,9 +642,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. */