bpo-1635741: Port _queue to multiphase initialization

tiran · tiran · commit 7a6dea106164 · 2020-11-19T08:49:22.000+01:00
Signed-off-by: Christian Heimes &lt;christian@python.org&gt;
diff --git a/Misc/NEWS.d/next/C API/2020-11-18-20-11-13.bpo-1635741.fe3iRb.rst b/Misc/NEWS.d/next/C API/2020-11-18-20-11-13.bpo-1635741.fe3iRb.rst
@@ -0,0 +1 @@
+Port _queue extension module to multiphase initialization (:pep:`489`)
diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c
@@ -381,55 +381,56 @@ PyDoc_STRVAR(queue_module_doc,
 "C implementation of the Python queue module.\n\
 This module is an implementation detail, please do not use it directly.");
 
-static struct PyModuleDef queuemodule = {
-    .m_base = PyModuleDef_HEAD_INIT,
-    .m_name = "_queue",
-    .m_doc = queue_module_doc,
-    .m_size = sizeof(simplequeue_state),
-    .m_traverse = queue_traverse,
-    .m_clear = queue_clear,
-    .m_free = queue_free,
-};
-
-
-PyMODINIT_FUNC
-PyInit__queue(void)
+static int
+queuemodule_exec(PyObject *module)
 {
-    PyObject *m;
-    simplequeue_state *state;
-
-    /* Create the module */
-    m = PyModule_Create(&queuemodule);
-    if (m == NULL)
-        return NULL;
-
-    state = simplequeue_get_state(m);
+    simplequeue_state *state = simplequeue_get_state(module);
     state->EmptyError = PyErr_NewExceptionWithDoc(
         "_queue.Empty",
         "Exception raised by Queue.get(block=0)/get_nowait().",
         NULL, NULL);
-    if (state->EmptyError == NULL)
-        goto error;
+    if (state->EmptyError == NULL) {
+        return -1;
+    }
 
     Py_INCREF(state->EmptyError);
-    if (PyModule_AddObject(m, "Empty", state->EmptyError) < 0) {
-        Py_DECREF(state->EmptyError);
-        goto error;
+    if (PyModule_AddObject(module, "Empty", state->EmptyError) < 0) {
+        Py_CLEAR(state->EmptyError);
+        return -1;
     }
 
-    state->SimpleQueueType = (PyTypeObject *)PyType_FromModuleAndSpec(m,
-                                                                 &simplequeue_spec,
-                                                                 NULL);
+    state->SimpleQueueType = (PyTypeObject *)PyType_FromModuleAndSpec(
+        module, &simplequeue_spec, NULL);
     if (state->SimpleQueueType == NULL) {
-        goto error;
+        return -1;
     }
-    if (PyModule_AddType(m, state->SimpleQueueType) < 0) {
-        goto error;
+    if (PyModule_AddType(module, state->SimpleQueueType) < 0) {
+        return -1;
     }
 
-    return m;
+    return 0;
+}
+
+static PyModuleDef_Slot queuemodule_slots[] = {
+    {Py_mod_exec, queuemodule_exec},
+    {0, NULL}
+};
+
+
+static struct PyModuleDef queuemodule = {
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = "_queue",
+    .m_doc = queue_module_doc,
+    .m_size = sizeof(simplequeue_state),
+    .m_slots = queuemodule_slots,
+    .m_traverse = queue_traverse,
+    .m_clear = queue_clear,
+    .m_free = queue_free,
+};
 
-error:
-    Py_DECREF(m);
-    return NULL;
+
+PyMODINIT_FUNC
+PyInit__queue(void)
+{
+   return PyModuleDef_Init(&queuemodule);
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Port _queue extension module to multiphase initialization (:pep:`489`)