bpo-1635741: Port _functools module to multiphase initialization (PEP 489) (GH-19151)

Paulo Henrique Silva · web-flow · commit 7dd549eb0893 · 2020-03-25T03:19:58.000+01:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-03-24-22-26-26.bpo-1635741.AB38ot.rst b/Misc/NEWS.d/next/Core and Builtins/2020-03-24-22-26-26.bpo-1635741.AB38ot.rst
@@ -0,0 +1,2 @@
+Port _functools module to multiphase initialization (PEP 489). Patch by
+Paulo Henrique Silva.
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -1400,58 +1400,62 @@ static PyTypeObject lru_cache_type = {
 
 /* module level code ********************************************************/
 
-PyDoc_STRVAR(module_doc,
+PyDoc_STRVAR(_functools_doc,
 "Tools that operate on functions.");
 
-static PyMethodDef module_methods[] = {
+static PyMethodDef _functools_methods[] = {
     {"reduce",          functools_reduce,     METH_VARARGS, functools_reduce_doc},
     {"cmp_to_key",      (PyCFunction)(void(*)(void))functools_cmp_to_key,
      METH_VARARGS | METH_KEYWORDS, functools_cmp_to_key_doc},
     {NULL,              NULL}           /* sentinel */
 };
 
 static void
-module_free(void *m)
+_functools_free(void *m)
 {
     Py_CLEAR(kwd_mark);
 }
 
-static struct PyModuleDef _functoolsmodule = {
-    PyModuleDef_HEAD_INIT,
-    "_functools",
-    module_doc,
-    -1,
-    module_methods,
-    NULL,
-    NULL,
-    NULL,
-    module_free,
-};
-
-PyMODINIT_FUNC
-PyInit__functools(void)
+static int
+_functools_exec(PyObject *module)
 {
-    PyObject *m;
     PyTypeObject *typelist[] = {
         &partial_type,
         &lru_cache_type
     };
 
-    m = PyModule_Create(&_functoolsmodule);
-    if (m == NULL)
-        return NULL;
-
     kwd_mark = _PyObject_CallNoArg((PyObject *)&PyBaseObject_Type);
     if (!kwd_mark) {
-        Py_DECREF(m);
-        return NULL;
+        return -1;
     }
 
     for (size_t i = 0; i < Py_ARRAY_LENGTH(typelist); i++) {
-        if (PyModule_AddType(m, typelist[i]) < 0) {
-            Py_DECREF(m);
-            return NULL;
+        if (PyModule_AddType(module, typelist[i]) < 0) {
+            return -1;
         }
     }
-    return m;
+    return 0;
+}
+
+static struct PyModuleDef_Slot _functools_slots[] = {
+    {Py_mod_exec, _functools_exec},
+    {0, NULL}
+};
+
+static struct PyModuleDef _functools_module = {
+    PyModuleDef_HEAD_INIT,
+    "_functools",
+    _functools_doc,
+    0,
+    _functools_methods,
+    _functools_slots,
+    NULL,
+    NULL,
+    _functools_free,
+};
+
+PyMODINIT_FUNC
+PyInit__functools(void)
+{
+    return PyModuleDef_Init(&_functools_module);
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Port _functools module to multiphase initialization (PEP 489). Patch by`
	`2`	`+Paulo Henrique Silva.`