summaryrefslogtreecommitdiffstats
path: root/Modules/_io/fileio.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-01-27 01:56:08 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-01-27 01:56:08 (GMT)
commit371c307e565e8c5b9b64e5902c735e347fe0a051 (patch)
treea600277d0e35c32ef2136f9c9f7c9783162407fe /Modules/_io/fileio.c
parent0a8f347fbc548930bcb610aec4bf6a4459bf7991 (diff)
downloadcpython-371c307e565e8c5b9b64e5902c735e347fe0a051.zip
cpython-371c307e565e8c5b9b64e5902c735e347fe0a051.tar.gz
cpython-371c307e565e8c5b9b64e5902c735e347fe0a051.tar.bz2
Merged revisions 77781-77782 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r77781 | benjamin.peterson | 2010-01-26 19:47:14 -0600 (Tue, 26 Jan 2010) | 1 line don't accept bytes in FileIO.write #7785 ........ r77782 | benjamin.peterson | 2010-01-26 19:51:29 -0600 (Tue, 26 Jan 2010) | 1 line add issue number ........
Diffstat (limited to 'Modules/_io/fileio.c')
-rw-r--r--Modules/_io/fileio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 8162396..d04a74d 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -651,7 +651,7 @@ fileio_write(fileio *self, PyObject *args)
if (!self->writable)
return err_mode("writing");
- if (!PyArg_ParseTuple(args, "s*", &pbuf))
+ if (!PyArg_ParseTuple(args, "y*", &pbuf))
return NULL;
if (_PyVerify_fd(self->fd)) {