Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-98627: Use a Switch in PyModule_FromDefAndSpec2() (gh-98734) 

This helps simplify some changes in follow-up PRs.  It also matches what we're doing in PyModule_ExecDef().
This commit is contained in:
Eric Snow 2022-10-26 21:20:54 -06:00 committed by GitHub
parent 96ae80f1d0
commit 731909ebef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Objects/moduleobject.c
View File

@ -291,23 +291,27 @@ PyModule_FromDefAndSpec2(PyModuleDef* def, PyObject *spec, int module_api_versio
}
for (cur_slot = def->m_slots; cur_slot && cur_slot->slot; cur_slot++) {
if (cur_slot->slot == Py_mod_create) {
if (create) {
switch (cur_slot->slot) {
case Py_mod_create:
if (create) {
PyErr_Format(
PyExc_SystemError,
"module %s has multiple create slots",
name);
goto error;
}
create = cur_slot->value;
break;
case Py_mod_exec:
has_execution_slots = 1;
break;
default:
assert(cur_slot->slot < 0 || cur_slot->slot > _Py_mod_LAST_SLOT);
PyErr_Format(
PyExc_SystemError,
"module %s has multiple create slots",
name);
"module %s uses unknown slot ID %i",
name, cur_slot->slot);
goto error;
}
create = cur_slot->value;
} else if (cur_slot->slot < 0 || cur_slot->slot > _Py_mod_LAST_SLOT) {
PyErr_Format(
PyExc_SystemError,
"module %s uses unknown slot ID %i",
name, cur_slot->slot);
goto error;
} else {
has_execution_slots = 1;
}
}