diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 07:12:08 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 07:12:08 (GMT) |
| commit | 3e30fd7c5978c642b5a8dc9430a41b321cfd6c20 (patch) | |
| tree | a07952f4b01b0d9f99f50d4ab9b74b6ae8f28c43 /Python | |
| parent | ff6cae38a2b084df0d7a106b15f64347518cf785 (diff) | |
| parent | cd6e69439c908a7d3aa0a5b13570c83d7cc57bf7 (diff) | |
| download | cpython-3e30fd7c5978c642b5a8dc9430a41b321cfd6c20.zip cpython-3e30fd7c5978c642b5a8dc9430a41b321cfd6c20.tar.gz cpython-3e30fd7c5978c642b5a8dc9430a41b321cfd6c20.tar.bz2 | |
Merge 3.5 (imp/_imp)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pylifecycle.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) 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 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) 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(); |