Stop using METH_OLDARGS implicitly

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a67f559d12beba94f43dbef3482618332024f58e..1ee407e5095f65e8aefc205df22d56a3360a6198 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1299,7 +1299,7 @@ static PyObject *
 PyCursesWindow_RedrawLine(PyCursesWindowObject *self, PyObject *args)
 {
   int beg, num;
-  if (!PyArg_ParseTuple(args,"ii;beg,num", &beg, &num))
+  if (!PyArg_ParseTuple(args, "ii;beg,num", &beg, &num))
     return NULL;
   return PyCursesCheckERR(wredrawln(self->win,beg,num), "redrawln");
 }
@@ -1533,7 +1533,7 @@ static PyMethodDef PyCursesWindow_Methods[] = {
        {"overwrite",       (PyCFunction)PyCursesWindow_Overwrite,
          METH_VARARGS},
        {"putwin",          (PyCFunction)PyCursesWindow_PutWin, METH_VARARGS},
-       {"redrawln",        (PyCFunction)PyCursesWindow_RedrawLine},
+       {"redrawln",        (PyCFunction)PyCursesWindow_RedrawLine, METH_VARARGS},
        {"redrawwin",       (PyCFunction)PyCursesWindow_redrawwin, METH_NOARGS},
        {"refresh",         (PyCFunction)PyCursesWindow_Refresh, METH_VARARGS},
 #ifndef STRICT_SYSV_CURSES

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 78e88b0312fe2dbda32ccd8f51a13d358330d9e9..ee938d610c4bed2f80896d822ad26b83c88c6e95 100644 (file)
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1789,7 +1789,7 @@ static struct PyMethodDef s_methods[] = {
        {"pack",        s_pack,         METH_VARARGS, s_pack__doc__},
        {"pack_into",   s_pack_into,    METH_VARARGS, s_pack_into__doc__},
        {"unpack",      s_unpack,       METH_O, s_unpack__doc__},
-       {"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS,
+       {"unpack_from", (PyCFunction)s_unpack_from, METH_VARARGS|METH_KEYWORDS,
                        s_unpack_from__doc__},
        {NULL,   NULL}          /* sentinel */
 };

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 1f132384ab3a9e1186f18c678178b35f5b649dd6..026319ae1129e806d92ceee3003e5ea4e4980651 100644 (file)
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -2631,7 +2631,7 @@ static PyMethodDef date_methods[] = {
        {"ctime",       (PyCFunction)date_ctime,        METH_NOARGS,
         PyDoc_STR("Return ctime() style string.")},
 
-       {"strftime",    (PyCFunction)date_strftime,     METH_KEYWORDS,
+       {"strftime",    (PyCFunction)date_strftime,     METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("format -> strftime() style string.")},
 
        {"timetuple",   (PyCFunction)date_timetuple,    METH_NOARGS,
@@ -2656,7 +2656,7 @@ static PyMethodDef date_methods[] = {
         PyDoc_STR("Return the day of the week represented by the date.\n"
                   "Monday == 0 ... Sunday == 6")},
 
-       {"replace",     (PyCFunction)date_replace,      METH_KEYWORDS,
+       {"replace",     (PyCFunction)date_replace,      METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("Return date with new specified fields.")},
 
        {"__reduce__", (PyCFunction)date_reduce,        METH_NOARGS,
@@ -3417,7 +3417,7 @@ static PyMethodDef time_methods[] = {
         PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]"
                   "[+HH:MM].")},
 
-       {"strftime",    (PyCFunction)time_strftime,     METH_KEYWORDS,
+       {"strftime",    (PyCFunction)time_strftime,     METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("format -> strftime() style string.")},
 
        {"utcoffset",   (PyCFunction)time_utcoffset,    METH_NOARGS,
@@ -3429,7 +3429,7 @@ static PyMethodDef time_methods[] = {
        {"dst",         (PyCFunction)time_dst,          METH_NOARGS,
         PyDoc_STR("Return self.tzinfo.dst(self).")},
 
-       {"replace",     (PyCFunction)time_replace,      METH_KEYWORDS,
+       {"replace",     (PyCFunction)time_replace,      METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("Return time with new specified fields.")},
 
        {"__reduce__", (PyCFunction)time_reduce,        METH_NOARGS,
@@ -4468,7 +4468,7 @@ static PyMethodDef datetime_methods[] = {
        /* Class methods: */
 
        {"now",         (PyCFunction)datetime_now,
-        METH_KEYWORDS | METH_CLASS,
+        METH_VARARGS | METH_KEYWORDS | METH_CLASS,
         PyDoc_STR("[tz] -> new datetime with tz's local day and time.")},
 
        {"utcnow",         (PyCFunction)datetime_utcnow,
@@ -4476,7 +4476,7 @@ static PyMethodDef datetime_methods[] = {
         PyDoc_STR("Return a new datetime representing UTC day and time.")},
 
        {"fromtimestamp", (PyCFunction)datetime_fromtimestamp,
-        METH_KEYWORDS | METH_CLASS,
+        METH_VARARGS | METH_KEYWORDS | METH_CLASS,
         PyDoc_STR("timestamp[, tz] -> tz's local time from POSIX timestamp.")},
 
        {"utcfromtimestamp", (PyCFunction)datetime_utcfromtimestamp,
@@ -4513,7 +4513,7 @@ static PyMethodDef datetime_methods[] = {
        {"utctimetuple",   (PyCFunction)datetime_utctimetuple, METH_NOARGS,
          PyDoc_STR("Return UTC time tuple, compatible with time.localtime().")},
 
-       {"isoformat",   (PyCFunction)datetime_isoformat, METH_KEYWORDS,
+       {"isoformat",   (PyCFunction)datetime_isoformat, METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("[sep] -> string in ISO 8601 format, "
                   "YYYY-MM-DDTHH:MM:SS[.mmmmmm][+HH:MM].\n\n"
                   "sep is used to separate the year from the time, and "
@@ -4528,10 +4528,10 @@ static PyMethodDef datetime_methods[] = {
        {"dst",         (PyCFunction)datetime_dst, METH_NOARGS,
         PyDoc_STR("Return self.tzinfo.dst(self).")},
 
-       {"replace",     (PyCFunction)datetime_replace,  METH_KEYWORDS,
+       {"replace",     (PyCFunction)datetime_replace,  METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("Return datetime with new specified fields.")},
 
-       {"astimezone",  (PyCFunction)datetime_astimezone, METH_KEYWORDS,
+       {"astimezone",  (PyCFunction)datetime_astimezone, METH_VARARGS | METH_KEYWORDS,
         PyDoc_STR("tz -> convert to local time in new timezone tz\n")},
 
        {"__reduce__", (PyCFunction)datetime_reduce,     METH_NOARGS,

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 7735851352867d2d2de1af14801f6d91bb7885ff..1f0204d15b964175913193cd9dba0e04090d516b 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4259,7 +4259,7 @@ tp_new_wrapper(PyObject *self, PyObject *args, PyObject *kwds)
 }
 
 static struct PyMethodDef tp_new_methoddef[] = {
-       {"__new__", (PyCFunction)tp_new_wrapper, METH_KEYWORDS,
+       {"__new__", (PyCFunction)tp_new_wrapper, METH_VARARGS|METH_KEYWORDS,
         PyDoc_STR("T.__new__(S, ...) -> "
                   "a new object with type S, a subtype of T")},
        {0}