Skip to content

Commit

Permalink
pythongh-98627: Use a Switch in PyModule_FromDefAndSpec2() (pythongh-…
Browse files Browse the repository at this point in the history
…98734)

This helps simplify some changes in follow-up PRs.  It also matches what we're doing in PyModule_ExecDef().
  • Loading branch information
ericsnowcurrently authored and gvanrossum committed Oct 28, 2022
1 parent c66cd30 commit a64d018
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions Objects/moduleobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit a64d018

Please sign in to comment.