[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (imp/_imp)

[victor.stinner]

https://hg.python.org/cpython/rev/ca37b31f71ac
changeset:   98036:ca37b31f71ac
parent:      98033:4ecf82ef7983
parent:      98035:03cd8340e0ce
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Sep 18 09:12:08 2015 +0200
summary:
  Merge 3.5 (imp/_imp)

files:
  Python/pylifecycle.c |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
--- 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();

-- 
Repository URL: https://hg.python.org/cpython