Issue #25160: Fix import_init() comments and messages
import_init() imports the "_imp" module, not the "imp" module.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index df66fa0..4f5efc9 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -252,13 +252,13 @@
interp->importlib = importlib;
Py_INCREF(interp->importlib);
- /* Install _importlib as __import__ */
+ /* Import the _imp module */
impmod = PyInit_imp();
if (impmod == NULL) {
- Py_FatalError("Py_Initialize: can't import imp");
+ Py_FatalError("Py_Initialize: can't import _imp");
}
else if (Py_VerboseFlag) {
- PySys_FormatStderr("import imp # builtin\n");
+ PySys_FormatStderr("import _imp # builtin\n");
}
sys_modules = PyImport_GetModuleDict();
if (Py_VerboseFlag) {
@@ -268,6 +268,7 @@
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);
if (value == NULL) {
PyErr_Print();