mirror of https://github.com/python/cpython
Issue #25160: Fix import_init() comments and messages
import_init() imports the "_imp" module, not the "imp" module.
This commit is contained in:
parent
d8f5fb4611
commit
cd6e69439c
|
@ -252,13 +252,13 @@ import_init(PyInterpreterState *interp, PyObject *sysmod)
|
||||||
interp->importlib = importlib;
|
interp->importlib = importlib;
|
||||||
Py_INCREF(interp->importlib);
|
Py_INCREF(interp->importlib);
|
||||||
|
|
||||||
/* Install _importlib as __import__ */
|
/* Import the _imp module */
|
||||||
impmod = PyInit_imp();
|
impmod = PyInit_imp();
|
||||||
if (impmod == NULL) {
|
if (impmod == NULL) {
|
||||||
Py_FatalError("Py_Initialize: can't import imp");
|
Py_FatalError("Py_Initialize: can't import _imp");
|
||||||
}
|
}
|
||||||
else if (Py_VerboseFlag) {
|
else if (Py_VerboseFlag) {
|
||||||
PySys_FormatStderr("import imp # builtin\n");
|
PySys_FormatStderr("import _imp # builtin\n");
|
||||||
}
|
}
|
||||||
sys_modules = PyImport_GetModuleDict();
|
sys_modules = PyImport_GetModuleDict();
|
||||||
if (Py_VerboseFlag) {
|
if (Py_VerboseFlag) {
|
||||||
|
@ -268,6 +268,7 @@ import_init(PyInterpreterState *interp, PyObject *sysmod)
|
||||||
Py_FatalError("Py_Initialize: can't save _imp to sys.modules");
|
Py_FatalError("Py_Initialize: can't save _imp to sys.modules");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Install importlib as the implementation of import */
|
||||||
value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod);
|
value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod);
|
||||||
if (value == NULL) {
|
if (value == NULL) {
|
||||||
PyErr_Print();
|
PyErr_Print();
|
||||||
|
|
Loading…
Reference in New Issue