mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-10 04:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-102660: Handle m_copy Specially for the sys and builtins Modules (gh-102661)

Browse source 
It doesn't make sense to use multi-phase init for these modules. Using a per-interpreter "m_copy" (instead of PyModuleDef.m_base.m_copy) makes this work okay. (This came up while working on gh-101660.)

Note that we might instead end up disallowing re-load for sys/builtins since they are so special.

https://github.com/python/cpython/issues/102660
This commit is contained in:
Eric Snow 2023-03-14 14:01:35 -06:00 • committed by GitHub
parent 80abd62647
commit cdb21ba74d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Python/import.c
View file

@ -978,6 +978,16 @@ _PyImport_CheckSubinterpIncompatibleExtensionAllowed(const char *name)
return 0;
}
static inline int
match_mod_name(PyObject *actual, const char *expected)
{
if (PyUnicode_CompareWithASCIIString(actual, expected) == 0) {
return 1;
}
assert(!PyErr_Occurred());
return 0;
}
static int
fix_up_extension(PyObject *mod, PyObject *name, PyObject *filename)
{
@ -1001,7 +1011,8 @@ fix_up_extension(PyObject *mod, PyObject *name, PyObject *filename)
// when the extension module doesn't support sub-interpreters.
// XXX Why special-case the main interpreter?
if (_Py_IsMainInterpreter(tstate->interp) || def->m_size == -1) {
if (def->m_size == -1) {
/* m_copy of Py_None means it is copied some other way. */
if (def->m_size == -1 && def->m_base.m_copy != Py_None) {
if (def->m_base.m_copy) {
/* Somebody already imported the module,
likely under a different name.
@ -1055,18 +1066,34 @@ import_find_extension(PyThreadState *tstate, PyObject *name,
PyObject *modules = MODULES(tstate->interp);
if (def->m_size == -1) {
PyObject *m_copy = def->m_base.m_copy;
/* Module does not support repeated initialization */
if (def->m_base.m_copy == NULL)
if (m_copy == NULL) {
return NULL;
}
else if (m_copy == Py_None) {
if (match_mod_name(name, "sys")) {
m_copy = tstate->interp->sysdict_copy;
}
else if (match_mod_name(name, "builtins")) {
m_copy = tstate->interp->builtins_copy;
}
else {
_PyErr_SetString(tstate, PyExc_ImportError, "missing m_copy");
return NULL;
}
}
/* m_copy of Py_None means it is copied some other way. */
mod = import_add_module(tstate, name);
if (mod == NULL)
if (mod == NULL) {
return NULL;
}
mdict = PyModule_GetDict(mod);
if (mdict == NULL) {
Py_DECREF(mod);
return NULL;
}
if (PyDict_Update(mdict, def->m_base.m_copy)) {
if (PyDict_Update(mdict, m_copy)) {
Py_DECREF(mod);
return NULL;
}