Use symbolic METH_VARARGS instead of 1 for ml_flags

diff --git a/PC/_winreg.c b/PC/_winreg.c
index edfadac77ca4ae2e9882e7cf5edeae8824e9b524..c86d2bb4754950eed0b58f5c7dd392d83b1bfc45 100644 (file)
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -521,8 +521,8 @@ PyHKEY_DetachMethod(PyObject *self, PyObject *args)
 }
 
 static struct PyMethodDef PyHKEY_methods[] = {
-       {"Close",  PyHKEY_CloseMethod, 1, PyHKEY_Close_doc},
-       {"Detach", PyHKEY_DetachMethod, 1, PyHKEY_Detach_doc},
+       {"Close",  PyHKEY_CloseMethod, METH_VARARGS, PyHKEY_Close_doc},
+       {"Detach", PyHKEY_DetachMethod, METH_VARARGS, PyHKEY_Detach_doc},
        {NULL}
 };
 
@@ -1382,23 +1382,23 @@ PySetValueEx(PyObject *self, PyObject *args)
 }
 
 static struct PyMethodDef winreg_methods[] = {
-       {"CloseKey",         PyCloseKey,        1, CloseKey_doc},
-       {"ConnectRegistry",  PyConnectRegistry, 1, ConnectRegistry_doc},
-       {"CreateKey",        PyCreateKey,       1, CreateKey_doc},
-       {"DeleteKey",        PyDeleteKey,       1, DeleteKey_doc},
-       {"DeleteValue",      PyDeleteValue,     1, DeleteValue_doc},
-       {"EnumKey",          PyEnumKey,         1, EnumKey_doc},
-       {"EnumValue",        PyEnumValue,       1, EnumValue_doc},
-       {"FlushKey",         PyFlushKey,        1, FlushKey_doc},
-       {"LoadKey",          PyLoadKey,         1, LoadKey_doc},
-       {"OpenKey",          PyOpenKey,         1, OpenKey_doc},
-       {"OpenKeyEx",        PyOpenKey,         1, OpenKeyEx_doc},
-       {"QueryValue",       PyQueryValue,      1, QueryValue_doc},
-       {"QueryValueEx",     PyQueryValueEx,    1, QueryValueEx_doc},
-       {"QueryInfoKey",     PyQueryInfoKey,    1, QueryInfoKey_doc},
-       {"SaveKey",          PySaveKey,         1, SaveKey_doc},
-       {"SetValue",         PySetValue,        1, SetValue_doc},
-       {"SetValueEx",       PySetValueEx,      1, SetValueEx_doc},
+       {"CloseKey",         PyCloseKey,        METH_VARARGS, CloseKey_doc},
+       {"ConnectRegistry",  PyConnectRegistry, METH_VARARGS, ConnectRegistry_doc},
+       {"CreateKey",        PyCreateKey,       METH_VARARGS, CreateKey_doc},
+       {"DeleteKey",        PyDeleteKey,       METH_VARARGS, DeleteKey_doc},
+       {"DeleteValue",      PyDeleteValue,     METH_VARARGS, DeleteValue_doc},
+       {"EnumKey",          PyEnumKey,         METH_VARARGS, EnumKey_doc},
+       {"EnumValue",        PyEnumValue,       METH_VARARGS, EnumValue_doc},
+       {"FlushKey",         PyFlushKey,        METH_VARARGS, FlushKey_doc},
+       {"LoadKey",          PyLoadKey,         METH_VARARGS, LoadKey_doc},
+       {"OpenKey",          PyOpenKey,         METH_VARARGS, OpenKey_doc},
+       {"OpenKeyEx",        PyOpenKey,         METH_VARARGS, OpenKeyEx_doc},
+       {"QueryValue",       PyQueryValue,      METH_VARARGS, QueryValue_doc},
+       {"QueryValueEx",     PyQueryValueEx,    METH_VARARGS, QueryValueEx_doc},
+       {"QueryInfoKey",     PyQueryInfoKey,    METH_VARARGS, QueryInfoKey_doc},
+       {"SaveKey",          PySaveKey,         METH_VARARGS, SaveKey_doc},
+       {"SetValue",         PySetValue,        METH_VARARGS, SetValue_doc},
+       {"SetValueEx",       PySetValueEx,      METH_VARARGS, SetValueEx_doc},
        NULL,
 };
 

diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 45843702367b059dffa6e1b91d3c9dc7be216ce3..5afa45f9c30a35ac301809a2dfab1b7b754f3024 100755 (executable)
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -204,16 +204,16 @@ insertint(PyObject *d, char *name, int value)
 
 /* List of functions exported by this module */
 static struct PyMethodDef msvcrt_functions[] = {
-       {"heapmin",             msvcrt_heapmin, 1},
-       {"locking",             msvcrt_locking, 1},
-       {"setmode",             msvcrt_setmode, 1},
-       {"open_osfhandle",      msvcrt_open_osfhandle, 1},
-       {"get_osfhandle",       msvcrt_get_osfhandle, 1},
-       {"kbhit",               msvcrt_kbhit, 1},
-       {"getch",               msvcrt_getch, 1},
-       {"getche",              msvcrt_getche, 1},
-       {"putch",               msvcrt_putch, 1},
-       {"ungetch",             msvcrt_ungetch, 1},
+       {"heapmin",             msvcrt_heapmin, METH_VARARGS},
+       {"locking",             msvcrt_locking, METH_VARARGS},
+       {"setmode",             msvcrt_setmode, METH_VARARGS},
+       {"open_osfhandle",      msvcrt_open_osfhandle, METH_VARARGS},
+       {"get_osfhandle",       msvcrt_get_osfhandle, METH_VARARGS},
+       {"kbhit",               msvcrt_kbhit, METH_VARARGS},
+       {"getch",               msvcrt_getch, METH_VARARGS},
+       {"getche",              msvcrt_getche, METH_VARARGS},
+       {"putch",               msvcrt_putch, METH_VARARGS},
+       {"ungetch",             msvcrt_ungetch, METH_VARARGS},
        {NULL,                  NULL}
 };
 

diff --git a/PC/winsound.c b/PC/winsound.c
index e182db536b628aec367cbcee8bd1e9601ba62bce..704af6c283dfdb65fd64534df1a4d31174e113bf 100644 (file)
--- a/PC/winsound.c
+++ b/PC/winsound.c
@@ -175,8 +175,8 @@ sound_beep(PyObject *self, PyObject *args)
 
 static struct PyMethodDef sound_methods[] =
 {
-    {"PlaySound", sound_playsound, 1, sound_playsound_doc},
-    {"Beep",      sound_beep,      1, sound_beep_doc},
+    {"PlaySound", sound_playsound, METH_VARARGS, sound_playsound_doc},
+    {"Beep",      sound_beep,      METH_VARARGS, sound_beep_doc},
     {NULL,  NULL}
 };
 

diff --git a/Python/import.c b/Python/import.c
index 50bd729e4ef976c1a98b1dceff58339bbc614e37..3055f5bc665f5eaf37e3ecb2cd48c1b190375058 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -2505,27 +2505,27 @@ On platforms without threads, return 0.\
 ";
 
 static PyMethodDef imp_methods[] = {
-       {"find_module",         imp_find_module,        1, doc_find_module},
-       {"get_magic",           imp_get_magic,          1, doc_get_magic},
-       {"get_suffixes",        imp_get_suffixes,       1, doc_get_suffixes},
-       {"load_module",         imp_load_module,        1, doc_load_module},
-       {"new_module",          imp_new_module,         1, doc_new_module},
-       {"lock_held",           imp_lock_held,          1, doc_lock_held},
+       {"find_module",         imp_find_module, METH_VARARGS, doc_find_module},
+       {"get_magic",           imp_get_magic,   METH_VARARGS, doc_get_magic},
+       {"get_suffixes",        imp_get_suffixes, METH_VARARGS, doc_get_suffixes},
+       {"load_module",         imp_load_module, METH_VARARGS, doc_load_module},
+       {"new_module",          imp_new_module,  METH_VARARGS, doc_new_module},
+       {"lock_held",           imp_lock_held,   METH_VARARGS, doc_lock_held},
        /* The rest are obsolete */
-       {"get_frozen_object",   imp_get_frozen_object,  1},
-       {"init_builtin",        imp_init_builtin,       1},
-       {"init_frozen",         imp_init_frozen,        1},
-       {"is_builtin",          imp_is_builtin,         1},
-       {"is_frozen",           imp_is_frozen,          1},
-       {"load_compiled",       imp_load_compiled,      1},
+       {"get_frozen_object",   imp_get_frozen_object,  METH_VARARGS},
+       {"init_builtin",        imp_init_builtin,       METH_VARARGS},
+       {"init_frozen",         imp_init_frozen,        METH_VARARGS},
+       {"is_builtin",          imp_is_builtin,         METH_VARARGS},
+       {"is_frozen",           imp_is_frozen,          METH_VARARGS},
+       {"load_compiled",       imp_load_compiled,      METH_VARARGS},
 #ifdef HAVE_DYNAMIC_LOADING
-       {"load_dynamic",        imp_load_dynamic,       1},
+       {"load_dynamic",        imp_load_dynamic,       METH_VARARGS},
 #endif
-       {"load_package",        imp_load_package,       1},
+       {"load_package",        imp_load_package,       METH_VARARGS},
 #ifdef macintosh
-       {"load_resource",       imp_load_resource,      1},
+       {"load_resource",       imp_load_resource,      METH_VARARGS},
 #endif
-       {"load_source",         imp_load_source,        1},
+       {"load_source",         imp_load_source,        METH_VARARGS},
        {NULL,                  NULL}           /* sentinel */
 };
 

diff --git a/Python/marshal.c b/Python/marshal.c
index 0d21e847b770b9227a1a4dc77f497d85d8bd2eb1..3cdaecd5edba0ae3287859bc88debb7bc51670d9 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -852,10 +852,10 @@ marshal_loads(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef marshal_methods[] = {
-       {"dump",        marshal_dump,   1},
-       {"load",        marshal_load,   1},
-       {"dumps",       marshal_dumps,  1},
-       {"loads",       marshal_loads,  1},
+       {"dump",        marshal_dump,   METH_VARARGS},
+       {"load",        marshal_load,   METH_VARARGS},
+       {"dumps",       marshal_dumps,  METH_VARARGS},
+       {"loads",       marshal_loads,  METH_VARARGS},
        {NULL,          NULL}           /* sentinel */
 };