diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-02 22:23:19 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-02 22:23:19 (GMT) |
| commit | 5cd2d8c7eca0a0a62ab58e8fa3b06d837ba6d6c1 (patch) | |
| tree | d71dddc0fe9cdcf92e560ac291222c064536236e /Modules | |
| parent | 080ad041d2de781c3c111c09c5ee849e18772f07 (diff) | |
| download | cpython-5cd2d8c7eca0a0a62ab58e8fa3b06d837ba6d6c1.zip cpython-5cd2d8c7eca0a0a62ab58e8fa3b06d837ba6d6c1.tar.gz cpython-5cd2d8c7eca0a0a62ab58e8fa3b06d837ba6d6c1.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')
| -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 a294332..15dbc33 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -825,7 +825,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}, {"__getstate__", (PyCFunction)bytesio_getstate, METH_NOARGS, NULL}, diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 505bde0..1761a25 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -809,7 +809,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}, |