diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-12-13 19:30:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-12-13 19:30:15 (GMT) |
| commit | 6b59f77c43c492f4c707ad4d8e2d2b0b871414e8 (patch) | |
| tree | 68d0d1953d03c1dda5c0f9ebc8c346f63d6e70ad /Modules/_io/fileio.c | |
| parent | bb4cd51982df53099990a11969afe57beae2d912 (diff) | |
| download | cpython-6b59f77c43c492f4c707ad4d8e2d2b0b871414e8.zip cpython-6b59f77c43c492f4c707ad4d8e2d2b0b871414e8.tar.gz cpython-6b59f77c43c492f4c707ad4d8e2d2b0b871414e8.tar.bz2 | |
Merged revisions 76806,76808 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76806 | benjamin.peterson | 2009-12-13 13:25:34 -0600 (Sun, 13 Dec 2009) | 14 lines
Merged revisions 76805 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76805 | benjamin.peterson | 2009-12-13 13:19:07 -0600 (Sun, 13 Dec 2009) | 7 lines
accept None as the same as having passed no argument in file types #7349
This is for consistency with imitation file objects like StringIO and BytesIO.
This commit also adds a few tests, where they were lacking for concerned
methods.
........
................
r76808 | benjamin.peterson | 2009-12-13 13:28:09 -0600 (Sun, 13 Dec 2009) | 9 lines
Merged revisions 76807 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76807 | benjamin.peterson | 2009-12-13 13:27:02 -0600 (Sun, 13 Dec 2009) | 1 line
remove unused variable
........
................
Diffstat (limited to 'Modules/_io/fileio.c')
| -rw-r--r-- | Modules/_io/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index f5ba971..8162396 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -602,7 +602,7 @@ fileio_read(fileio *self, PyObject *args) if (!self->readable) return err_mode("reading"); - if (!PyArg_ParseTuple(args, "|n", &size)) + if (!PyArg_ParseTuple(args, "|O&", &_PyIO_ConvertSsize_t, &size)) return NULL; if (size < 0) { |