[Python-checkins] r84441 - in python/branches/release31-maint: Modules/_io/bytesio.c Modules/_io/stringio.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Sep  3 00:21:32 2010
New Revision: 84441

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_io/bytesio.c
   python/branches/release31-maint/Modules/_io/stringio.c

Modified: python/branches/release31-maint/Modules/_io/bytesio.c
==============================================================================
--- python/branches/release31-maint/Modules/_io/bytesio.c	(original)
+++ python/branches/release31-maint/Modules/_io/bytesio.c	Fri Sep  3 00:21:32 2010
@@ -704,7 +704,7 @@
     {"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 */

Modified: python/branches/release31-maint/Modules/_io/stringio.c
==============================================================================
--- python/branches/release31-maint/Modules/_io/stringio.c	(original)
+++ python/branches/release31-maint/Modules/_io/stringio.c	Fri Sep  3 00:21:32 2010
@@ -698,7 +698,7 @@
 
 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},