diff options
| author | Brett Cannon <brett@python.org> | 2012-04-25 20:54:04 -0400 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-04-25 20:54:04 -0400 |
| commit | e0d88a173c5ccc346b8d7c6e805f0e49b4ea92f7 (patch) | |
| tree | 476528c79622c96645adf554536eeeba0c4ee0d8 /Python/pythonrun.c | |
| parent | 8f79dd5d7cc3eb19d568f8e95f04ee33f1177d92 (diff) | |
| download | cpython-git-e0d88a173c5ccc346b8d7c6e805f0e49b4ea92f7.tar.gz | |
Issue #14605: Make explicit the entries on sys.path_hooks that used to
be implicit.
Added a warning for when sys.path_hooks is found to be empty. Also
changed the meaning of None in sys.path_importer_cache to represent
trying sys.path_hooks again (an interpretation of previous semantics).
Also added a warning for when None was found.
The long-term goal is for None in sys.path_importer_cache to represent
the same as imp.NullImporter: no finder found for that sys.path entry.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 44a85bb355..9e20e4a051 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -229,7 +229,7 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) Py_FatalError("Py_Initialize: can't save _imp to sys.modules"); } - value = PyObject_CallMethod(importlib, "_setup", "OO", sysmod, impmod); + value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod); if (value == NULL) { PyErr_Print(); Py_FatalError("Py_Initialize: importlib install failed"); |