mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #15042: Add PyState_AddModule and PyState_RemoveModule.

Browse source 
Add version  guard for Py_LIMITED_API additions.
Issue #15081: Document PyState_FindModule.
Patch by Robin Schreiber.
This commit is contained in:
Martin v. Löwis 2012-06-22 12:20:55 +02:00
parent 7f59fd7c7c
commit 7800f75827
5 changed files with 77 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Python/pystate.c
View file

@ -239,9 +239,9 @@ _PyThreadState_Init(PyThreadState *tstate)
}
PyObject*
PyState_FindModule(struct PyModuleDef* m)
PyState_FindModule(struct PyModuleDef* module)
{
Py_ssize_t index = m->m_base.m_index;
Py_ssize_t index = module->m_base.m_index;
PyInterpreterState *state = PyThreadState_GET()->interp;
PyObject *res;
if (index == 0)
@ -273,6 +273,47 @@ _PyState_AddModule(PyObject* module, struct PyModuleDef* def)
def->m_base.m_index, module);
}
int
PyState_AddModule(PyObject* module, struct PyModuleDef* def)
{
Py_ssize_t index;
PyInterpreterState *state = PyThreadState_GET()->interp;
if (!def) {
Py_FatalError("PyState_AddModule: Module Definition is NULL");
return -1;
}
index = def->m_base.m_index;
if (state->modules_by_index) {
if(PyList_GET_SIZE(state->modules_by_index) >= index) {
if(module == PyList_GET_ITEM(state->modules_by_index, index)) {
Py_FatalError("PyState_AddModule: Module already added!");
return -1;
}
}
}
return _PyState_AddModule(module, def);
}
int
PyState_RemoveModule(struct PyModuleDef* def)
{
Py_ssize_t index = def->m_base.m_index;
PyInterpreterState *state = PyThreadState_GET()->interp;
if (index == 0) {
Py_FatalError("PyState_RemoveModule: Module index invalid.");
return -1;
}
if (state->modules_by_index == NULL) {
Py_FatalError("PyState_RemoveModule: Interpreters module-list not acessible.");
return -1;
}
if (index > PyList_GET_SIZE(state->modules_by_index)) {
Py_FatalError("PyState_RemoveModule: Module index out of bounds.");
return -1;
}
return PyList_SetItem(state->modules_by_index, index, Py_None);
}
void
PyThreadState_Clear(PyThreadState *tstate)
{