From 233cc5987b6659d0fcd033a420ad8b5390ffa772 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Wed, 14 Aug 2002 20:57:56 +0000 Subject: [PATCH] Py_InitModule4(): Accept NULL for the 'methods' argument. This makes sense now that extension types can support __init__ directly rather than requiring function constructors. --- Python/modsupport.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Python/modsupport.c b/Python/modsupport.c index 1f8ef07d171..98b03413301 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -56,22 +56,24 @@ Py_InitModule4(char *name, PyMethodDef *methods, char *doc, if ((m = PyImport_AddModule(name)) == NULL) return NULL; d = PyModule_GetDict(m); - for (ml = methods; ml->ml_name != NULL; ml++) { - if ((ml->ml_flags & METH_CLASS) || - (ml->ml_flags & METH_STATIC)) { - PyErr_SetString(PyExc_ValueError, - "module functions cannot set" - " METH_CLASS or METH_STATIC"); - return NULL; - } - v = PyCFunction_New(ml, passthrough); - if (v == NULL) - return NULL; - if (PyDict_SetItemString(d, ml->ml_name, v) != 0) { + if (methods != NULL) { + for (ml = methods; ml->ml_name != NULL; ml++) { + if ((ml->ml_flags & METH_CLASS) || + (ml->ml_flags & METH_STATIC)) { + PyErr_SetString(PyExc_ValueError, + "module functions cannot set" + " METH_CLASS or METH_STATIC"); + return NULL; + } + v = PyCFunction_New(ml, passthrough); + if (v == NULL) + return NULL; + if (PyDict_SetItemString(d, ml->ml_name, v) != 0) { + Py_DECREF(v); + return NULL; + } Py_DECREF(v); - return NULL; } - Py_DECREF(v); } if (doc != NULL) { v = PyString_FromString(doc);