summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2023-02-16 21:05:31 (GMT)
committerGitHub <noreply@github.com>2023-02-16 21:05:31 (GMT)
commit4d8959b73ac194ca9a2f623dcb5c23680f7d8536 (patch)
tree6856f3c336d38f4531f3e926d121bf1613ce3bd2 /Python
parenta5024a261a75dafa4fb6613298dcb64a9603d9c7 (diff)
downloadcpython-4d8959b73ac194ca9a2f623dcb5c23680f7d8536.zip
cpython-4d8959b73ac194ca9a2f623dcb5c23680f7d8536.tar.gz
cpython-4d8959b73ac194ca9a2f623dcb5c23680f7d8536.tar.bz2
gh-101758: Add _PyState_AddModule() Back for the Stable ABI (gh-101956)
We're adding the function back, only for the stable ABI symbol and not as any form of API. I had removed it yesterday. This undocumented "private" function was added with the implementation for PEP 3121 (3.0, 2007) for internal use and later moved out of the limited API (3.6, 2016) and then into the internal API (3.9, 2019). I removed it completely yesterday, including from the stable ABI manifest (where it was added because the symbol happened to be exported). It's unlikely that anyone is using _PyState_AddModule(), especially any stable ABI extensions built against 3.2-3.5, but we're playing it safe. https://github.com/python/cpython/issues/101758
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/Python/import.c b/Python/import.c
index ec126f2..fabf03b 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -487,6 +487,26 @@ PyState_FindModule(PyModuleDef* module)
return _modules_by_index_get(interp, module);
}
+/* _PyState_AddModule() has been completely removed from the C-API
+ (and was removed from the limited API in 3.6). However, we're
+ playing it safe and keeping it around for any stable ABI extensions
+ built against 3.2-3.5. */
+int
+_PyState_AddModule(PyThreadState *tstate, PyObject* module, PyModuleDef* def)
+{
+ if (!def) {
+ assert(_PyErr_Occurred(tstate));
+ return -1;
+ }
+ if (def->m_slots) {
+ _PyErr_SetString(tstate,
+ PyExc_SystemError,
+ "PyState_AddModule called on module with slots");
+ return -1;
+ }
+ return _modules_by_index_set(tstate->interp, def, module);
+}
+
int
PyState_AddModule(PyObject* module, PyModuleDef* def)
{