mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 74316,74335 via svnmerge from

Browse source 
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
........
This commit is contained in:
Georg Brandl 2009-08-13 08:35:19 +00:00
parent c5605dffdb
commit 97b28f8437
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/codecs.rst
View file

@ -74,7 +74,7 @@ It defines the following functions:
continue without further notice), ``'xmlcharrefreplace'`` (replace with the continue without further notice), ``'xmlcharrefreplace'`` (replace with the
appropriate XML character reference (for encoding only)), appropriate XML character reference (for encoding only)),
``'backslashreplace'`` (replace with backslashed escape sequences (for ``'backslashreplace'`` (replace with backslashed escape sequences (for
encoding only)), ``'surrogateescape'`` (replae with surrogate U+DCxx, see encoding only)), ``'surrogateescape'`` (replace with surrogate U+DCxx, see
:pep:`383`) as well as any other error handling name defined via :pep:`383`) as well as any other error handling name defined via
:func:`register_error`. :func:`register_error`.

4
Lib/test/test_memoryio.py
View file

@ -416,6 +416,10 @@ class PyBytesIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase):
self.assertEqual(memio.write(a), 10) self.assertEqual(memio.write(a), 10)
self.assertEqual(memio.getvalue(), buf) 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 PyStringIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase): class PyStringIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase):
buftype = str buftype = str

4
Modules/_io/bytesio.c
View file

@ -642,9 +642,11 @@ bytesio_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int static int
bytesio_init(bytesio *self, PyObject *args, PyObject *kwds) bytesio_init(bytesio *self, PyObject *args, PyObject *kwds)
{ {
char *kwlist[] = {"initial_bytes", NULL};
PyObject *initvalue = NULL; PyObject *initvalue = NULL;
if (!PyArg_ParseTuple(args, "|O:BytesIO", &initvalue)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:BytesIO", kwlist,
&initvalue))
return -1; return -1;
/* In case, __init__ is called multiple times. */ /* In case, __init__ is called multiple times. */