From a1abb728bc0d3898539ea89effa7906a50366f1a Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Thu, 3 Aug 2000 02:34:44 +0000 Subject: [PATCH] Use METH_OLDARGS instead of numeric constant 0 in method def. tables --- Modules/cryptmodule.c | 2 +- Modules/md5module.c | 9 ++++++--- Modules/pwdmodule.c | 6 +++--- Modules/readline.c | 15 ++++++++------- Modules/signalmodule.c | 12 ++++++------ Modules/stropmodule.c | 21 ++++++++++++++------- Modules/termios.c | 18 ++++++++++++------ Modules/threadmodule.c | 38 ++++++++++++++++++++++---------------- Modules/timemodule.c | 12 ++++++------ 9 files changed, 78 insertions(+), 55 deletions(-) diff --git a/Modules/cryptmodule.c b/Modules/cryptmodule.c index d3e07931920..1e660391fcc 100644 --- a/Modules/cryptmodule.c +++ b/Modules/cryptmodule.c @@ -31,7 +31,7 @@ the same alphabet as the salt."; static PyMethodDef crypt_methods[] = { - {"crypt", crypt_crypt, 0, crypt_crypt__doc__}, + {"crypt", crypt_crypt, METH_OLDARGS, crypt_crypt__doc__}, {NULL, NULL} /* sentinel */ }; diff --git a/Modules/md5module.c b/Modules/md5module.c index 78a2b451240..591ba2816d4 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -126,9 +126,12 @@ Return a copy (``clone'') of the md5 object."; static PyMethodDef md5_methods[] = { - {"update", (PyCFunction)md5_update, 0, update_doc}, - {"digest", (PyCFunction)md5_digest, 0, digest_doc}, - {"copy", (PyCFunction)md5_copy, 0, copy_doc}, + {"update", (PyCFunction)md5_update, + METH_OLDARGS, update_doc}, + {"digest", (PyCFunction)md5_digest, + METH_OLDARGS, digest_doc}, + {"copy", (PyCFunction)md5_copy, + METH_OLDARGS, copy_doc}, {NULL, NULL} /* sentinel */ }; diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c index ada9e6df489..1efe81ade87 100644 --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -128,10 +128,10 @@ pwd_getpwall(PyObject *self, PyObject *args) #endif static PyMethodDef pwd_methods[] = { - {"getpwuid", pwd_getpwuid, 0, pwd_getpwuid__doc__}, - {"getpwnam", pwd_getpwnam, 0, pwd_getpwnam__doc__}, + {"getpwuid", pwd_getpwuid, METH_OLDARGS, pwd_getpwuid__doc__}, + {"getpwnam", pwd_getpwnam, METH_OLDARGS, pwd_getpwnam__doc__}, #ifdef HAVE_GETPWENT - {"getpwall", pwd_getpwall, 0, pwd_getpwall__doc__}, + {"getpwall", pwd_getpwall, METH_OLDARGS, pwd_getpwall__doc__}, #endif {NULL, NULL} /* sentinel */ }; diff --git a/Modules/readline.c b/Modules/readline.c index 11804c7cc35..fe6bf22362f 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -324,7 +324,8 @@ Insert text into the command line.\ static struct PyMethodDef readline_methods[] = { {"parse_and_bind", parse_and_bind, METH_VARARGS, doc_parse_and_bind}, - {"get_line_buffer", get_line_buffer, 0, doc_get_line_buffer}, + {"get_line_buffer", get_line_buffer, + METH_OLDARGS, doc_get_line_buffer}, {"insert_text", insert_text, METH_VARARGS, doc_insert_text}, {"read_init_file", read_init_file, METH_VARARGS, doc_read_init_file}, {"read_history_file", read_history_file, @@ -336,13 +337,13 @@ static struct PyMethodDef readline_methods[] = {"get_history_length", get_history_length, METH_VARARGS, get_history_length_doc}, {"set_completer", set_completer, METH_VARARGS, doc_set_completer}, - {"get_begidx", get_begidx, 0, doc_get_begidx}, - {"get_endidx", get_endidx, 0, doc_get_endidx}, + {"get_begidx", get_begidx, METH_OLDARGS, doc_get_begidx}, + {"get_endidx", get_endidx, METH_OLDARGS, doc_get_endidx}, - {"set_completer_delims", set_completer_delims, METH_VARARGS, - doc_set_completer_delims}, - {"get_completer_delims", get_completer_delims, 0, - doc_get_completer_delims}, + {"set_completer_delims", set_completer_delims, + METH_VARARGS, doc_set_completer_delims}, + {"get_completer_delims", get_completer_delims, + METH_OLDARGS, doc_get_completer_delims}, {0, 0} }; diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 4829dbfc633..4b9876f4976 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -280,15 +280,15 @@ anything else -- the callable Python object used as a handler\n\ /* List of functions defined in the module */ static PyMethodDef signal_methods[] = { #ifdef HAVE_ALARM - {"alarm", signal_alarm, 0, alarm_doc}, + {"alarm", signal_alarm, METH_OLDARGS, alarm_doc}, #endif - {"signal", signal_signal, 0, signal_doc}, - {"getsignal", signal_getsignal, 0, getsignal_doc}, + {"signal", signal_signal, METH_OLDARGS, signal_doc}, + {"getsignal", signal_getsignal, METH_OLDARGS, getsignal_doc}, #ifdef HAVE_PAUSE - {"pause", signal_pause, 0, pause_doc}, + {"pause", signal_pause, METH_OLDARGS, pause_doc}, #endif - {"default_int_handler", signal_default_int_handler, 0, - default_int_handler_doc}, + {"default_int_handler", signal_default_int_handler, + METH_OLDARGS, default_int_handler_doc}, {NULL, NULL} /* sentinel */ }; diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c index 0353ca555c2..1980032e2eb 100644 --- a/Modules/stropmodule.c +++ b/Modules/stropmodule.c @@ -1160,7 +1160,8 @@ strop_methods[] = { METH_VARARGS, atoi__doc__}, {"atol", strop_atol, METH_VARARGS, atol__doc__}, - {"capitalize", strop_capitalize, 0, capitalize__doc__}, + {"capitalize", strop_capitalize, + METH_OLDARGS, capitalize__doc__}, {"count", strop_count, METH_VARARGS, count__doc__}, {"expandtabs", strop_expandtabs, @@ -1171,24 +1172,30 @@ strop_methods[] = { METH_VARARGS, joinfields__doc__}, {"joinfields", strop_joinfields, METH_VARARGS, joinfields__doc__}, - {"lstrip", strop_lstrip, 0, lstrip__doc__}, - {"lower", strop_lower, 0, lower__doc__}, + {"lstrip", strop_lstrip, + METH_OLDARGS, lstrip__doc__}, + {"lower", strop_lower, + METH_OLDARGS, lower__doc__}, {"maketrans", strop_maketrans, METH_VARARGS, maketrans__doc__}, {"replace", strop_replace, METH_VARARGS, replace__doc__}, {"rfind", strop_rfind, METH_VARARGS, rfind__doc__}, - {"rstrip", strop_rstrip, 0, rstrip__doc__}, + {"rstrip", strop_rstrip, + METH_OLDARGS, rstrip__doc__}, {"split", strop_splitfields, METH_VARARGS, splitfields__doc__}, {"splitfields", strop_splitfields, METH_VARARGS, splitfields__doc__}, - {"strip", strop_strip, 0, strip__doc__}, - {"swapcase", strop_swapcase, 0, swapcase__doc__}, + {"strip", strop_strip, + METH_OLDARGS, strip__doc__}, + {"swapcase", strop_swapcase, + METH_OLDARGS, swapcase__doc__}, {"translate", strop_translate, METH_VARARGS, translate__doc__}, - {"upper", strop_upper, 0, upper__doc__}, + {"upper", strop_upper, + METH_OLDARGS, upper__doc__}, {NULL, NULL} /* sentinel */ }; diff --git a/Modules/termios.c b/Modules/termios.c index 0dbb25776b5..91ab4840e8f 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -278,12 +278,18 @@ termios_tcflow(PyObject *self, PyObject *args) static PyMethodDef termios_methods[] = { - {"tcgetattr", termios_tcgetattr, 0, termios_tcgetattr__doc__}, - {"tcsetattr", termios_tcsetattr, 0, termios_tcsetattr__doc__}, - {"tcsendbreak", termios_tcsendbreak, 0, termios_tcsendbreak__doc__}, - {"tcdrain", termios_tcdrain, 0, termios_tcdrain__doc__}, - {"tcflush", termios_tcflush, 0, termios_tcflush__doc__}, - {"tcflow", termios_tcflow, 0, termios_tcflow__doc__}, + {"tcgetattr", termios_tcgetattr, + METH_OLDARGS, termios_tcgetattr__doc__}, + {"tcsetattr", termios_tcsetattr, + METH_OLDARGS, termios_tcsetattr__doc__}, + {"tcsendbreak", termios_tcsendbreak, + METH_OLDARGS, termios_tcsendbreak__doc__}, + {"tcdrain", termios_tcdrain, + METH_OLDARGS, termios_tcdrain__doc__}, + {"tcflush", termios_tcflush, + METH_OLDARGS, termios_tcflush__doc__}, + {"tcflow", termios_tcflow, + METH_OLDARGS, termios_tcflow__doc__}, {NULL, NULL} }; diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c index 5d0de4a14dc..a6251461ba7 100644 --- a/Modules/threadmodule.c +++ b/Modules/threadmodule.c @@ -141,12 +141,18 @@ static char locked_doc[] = Return whether the lock is in the locked state."; static PyMethodDef lock_methods[] = { - {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock, 0, acquire_doc}, - {"acquire", (PyCFunction)lock_PyThread_acquire_lock, 0, acquire_doc}, - {"release_lock", (PyCFunction)lock_PyThread_release_lock, 0, release_doc}, - {"release", (PyCFunction)lock_PyThread_release_lock, 0, release_doc}, - {"locked_lock", (PyCFunction)lock_locked_lock, 0, locked_doc}, - {"locked", (PyCFunction)lock_locked_lock, 0, locked_doc}, + {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock, + METH_OLDARGS, acquire_doc}, + {"acquire", (PyCFunction)lock_PyThread_acquire_lock, + METH_OLDARGS, acquire_doc}, + {"release_lock", (PyCFunction)lock_PyThread_release_lock, + METH_OLDARGS, release_doc}, + {"release", (PyCFunction)lock_PyThread_release_lock, + METH_OLDARGS, release_doc}, + {"locked_lock", (PyCFunction)lock_locked_lock, + METH_OLDARGS, locked_doc}, + {"locked", (PyCFunction)lock_locked_lock, + METH_OLDARGS, locked_doc}, {NULL, NULL} /* sentinel */ }; @@ -343,16 +349,16 @@ static PyMethodDef thread_methods[] = { {"start_new", (PyCFunction)thread_PyThread_start_new_thread, METH_VARARGS, start_new_doc}, - {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock, 0, - allocate_doc}, - {"allocate", (PyCFunction)thread_PyThread_allocate_lock, 0, - allocate_doc}, - {"exit_thread", (PyCFunction)thread_PyThread_exit_thread, 0, - exit_doc}, - {"exit", (PyCFunction)thread_PyThread_exit_thread, 0, - exit_doc}, - {"get_ident", (PyCFunction)thread_get_ident, 0, - get_ident_doc}, + {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock, + METH_OLDARGS, allocate_doc}, + {"allocate", (PyCFunction)thread_PyThread_allocate_lock, + METH_OLDARGS, allocate_doc}, + {"exit_thread", (PyCFunction)thread_PyThread_exit_thread, + METH_OLDARGS, exit_doc}, + {"exit", (PyCFunction)thread_PyThread_exit_thread, + METH_OLDARGS, exit_doc}, + {"get_ident", (PyCFunction)thread_get_ident, + METH_OLDARGS, get_ident_doc}, #ifndef NO_EXIT_PROG {"exit_prog", (PyCFunction)thread_PyThread_exit_prog}, #endif diff --git a/Modules/timemodule.c b/Modules/timemodule.c index e84a32cd54f..fa40762582b 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -491,15 +491,15 @@ Convert a time tuple in local time to seconds since the Epoch."; #endif /* HAVE_MKTIME */ static PyMethodDef time_methods[] = { - {"time", time_time, 0, time_doc}, + {"time", time_time, METH_OLDARGS, time_doc}, #ifdef HAVE_CLOCK - {"clock", time_clock, 0, clock_doc}, + {"clock", time_clock, METH_OLDARGS, clock_doc}, #endif - {"sleep", time_sleep, 0, sleep_doc}, - {"gmtime", time_gmtime, 0, gmtime_doc}, - {"localtime", time_localtime, 0, localtime_doc}, + {"sleep", time_sleep, METH_OLDARGS, sleep_doc}, + {"gmtime", time_gmtime, METH_OLDARGS, gmtime_doc}, + {"localtime", time_localtime, METH_OLDARGS, localtime_doc}, {"asctime", time_asctime, METH_VARARGS, asctime_doc}, - {"ctime", time_ctime, 0, ctime_doc}, + {"ctime", time_ctime, METH_OLDARGS, ctime_doc}, #ifdef HAVE_MKTIME {"mktime", time_mktime, METH_VARARGS, mktime_doc}, #endif