diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-02 22:21:32 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-02 22:21:32 (GMT) |
| commit | b82d5e1525f5bcad8c3ff23f2cfe679227643a65 (patch) | |
| tree | ae1d1818abb3ed7e93c777b67f640d3b99bb41ee /Modules/_io | |
| parent | 2f6bd27a7e74200c2b85e1db4d1fcb0322efae67 (diff) | |
| download | cpython-b82d5e1525f5bcad8c3ff23f2cfe679227643a65.zip cpython-b82d5e1525f5bcad8c3ff23f2cfe679227643a65.tar.gz cpython-b82d5e1525f5bcad8c3ff23f2cfe679227643a65.tar.bz2 | |
Merged revisions 84438 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84438 | antoine.pitrou | 2010-09-02 21:48:07 +0200 (jeu., 02 sept. 2010) | 3 lines
BytesIO.getvalue() and StringIO.getvalue() are METH_NOARGS.
........
Diffstat (limited to 'Modules/_io')
| -rw-r--r-- | Modules/_io/bytesio.c | 2 | ||||
| -rw-r--r-- | Modules/_io/stringio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index b93e325..29fb1ea 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -704,7 +704,7 @@ static struct PyMethodDef bytesio_methods[] = { {"readline", (PyCFunction)bytesio_readline, METH_VARARGS, readline_doc}, {"readlines", (PyCFunction)bytesio_readlines, METH_VARARGS, readlines_doc}, {"read", (PyCFunction)bytesio_read, METH_VARARGS, read_doc}, - {"getvalue", (PyCFunction)bytesio_getvalue, METH_VARARGS, getval_doc}, + {"getvalue", (PyCFunction)bytesio_getvalue, METH_NOARGS, getval_doc}, {"seek", (PyCFunction)bytesio_seek, METH_VARARGS, seek_doc}, {"truncate", (PyCFunction)bytesio_truncate, METH_VARARGS, truncate_doc}, {NULL, NULL} /* sentinel */ diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index e02d26b..7e3730a 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -698,7 +698,7 @@ stringio_newlines(stringio *self, void *context) static struct PyMethodDef stringio_methods[] = { {"close", (PyCFunction)stringio_close, METH_NOARGS, stringio_close_doc}, - {"getvalue", (PyCFunction)stringio_getvalue, METH_VARARGS, stringio_getvalue_doc}, + {"getvalue", (PyCFunction)stringio_getvalue, METH_NOARGS, stringio_getvalue_doc}, {"read", (PyCFunction)stringio_read, METH_VARARGS, stringio_read_doc}, {"readline", (PyCFunction)stringio_readline, METH_VARARGS, stringio_readline_doc}, {"tell", (PyCFunction)stringio_tell, METH_NOARGS, stringio_tell_doc}, |