traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-1635741: Port _queue to multiphase initialization (GH-23376) 

Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:tiran
This commit is contained in:
Christian Heimes 2020-11-19 09:24:37 +01:00 committed by GitHub
parent fa2eee975d
commit 3094dd5fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/C API/2020-11-18-20-11-13.bpo-1635741.fe3iRb.rst Normal file
View File

@ -0,0 +1 @@
Port _queue extension module to multiphase initialization (:pep:`489`)

73
Modules/_queuemodule.c
View File

@ -381,11 +381,46 @@ PyDoc_STRVAR(queue_module_doc,
"C implementation of the Python queue module.\n\ "C implementation of the Python queue module.\n\
This module is an implementation detail, please do not use it directly."); This module is an implementation detail, please do not use it directly.");
static int
queuemodule_exec(PyObject *module)
{
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) {
return -1;
}
if (PyModule_AddObjectRef(module, "Empty", state->EmptyError) < 0) {
return -1;
}
state->SimpleQueueType = (PyTypeObject *)PyType_FromModuleAndSpec(
module, &simplequeue_spec, NULL);
if (state->SimpleQueueType == NULL) {
return -1;
}
if (PyModule_AddType(module, state->SimpleQueueType) < 0) {
return -1;
}
return 0;
}
static PyModuleDef_Slot queuemodule_slots[] = {
{Py_mod_exec, queuemodule_exec},
{0, NULL}
};
static struct PyModuleDef queuemodule = { static struct PyModuleDef queuemodule = {
.m_base = PyModuleDef_HEAD_INIT, .m_base = PyModuleDef_HEAD_INIT,
.m_name = "_queue", .m_name = "_queue",
.m_doc = queue_module_doc, .m_doc = queue_module_doc,
.m_size = sizeof(simplequeue_state), .m_size = sizeof(simplequeue_state),
.m_slots = queuemodule_slots,
.m_traverse = queue_traverse, .m_traverse = queue_traverse,
.m_clear = queue_clear, .m_clear = queue_clear,
.m_free = queue_free, .m_free = queue_free,
@ -395,41 +430,5 @@ static struct PyModuleDef queuemodule = {
PyMODINIT_FUNC PyMODINIT_FUNC
PyInit__queue(void) PyInit__queue(void)
{ {
PyObject *m; return PyModuleDef_Init(&queuemodule);
simplequeue_state *state;
/* Create the module */
m = PyModule_Create(&queuemodule);
if (m == NULL)
return NULL;
state = simplequeue_get_state(m);
state->EmptyError = PyErr_NewExceptionWithDoc(
"_queue.Empty",
"Exception raised by Queue.get(block=0)/get_nowait().",
NULL, NULL);
if (state->EmptyError == NULL)
goto error;
Py_INCREF(state->EmptyError);
if (PyModule_AddObject(m, "Empty", state->EmptyError) < 0) {
Py_DECREF(state->EmptyError);
goto error;
}
state->SimpleQueueType = (PyTypeObject *)PyType_FromModuleAndSpec(m,
&simplequeue_spec,
NULL);
if (state->SimpleQueueType == NULL) {
goto error;
}
if (PyModule_AddType(m, state->SimpleQueueType) < 0) {
goto error;
}
return m;
error:
Py_DECREF(m);
return NULL;
} }