summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorPablo Galindo <Pablogsal@gmail.com>2018-04-25 02:22:28 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2018-04-25 02:22:28 (GMT)
commit0977091dca59709864b14cfc129388f1f0de7bf7 (patch)
treed6a4f1fd2c977ea619abb77b2e12144ee7dd14e2 /Python
parent650ba4ffd1dcd4e5eb246d7c176e204eb90c7a86 (diff)
downloadcpython-0977091dca59709864b14cfc129388f1f0de7bf7.zip
cpython-0977091dca59709864b14cfc129388f1f0de7bf7.tar.gz
cpython-0977091dca59709864b14cfc129388f1f0de7bf7.tar.bz2
bpo-33128 Fix duplicated call to importlib._install_external_importers (GH-6273)
External importers were being added in both phases of the import system initialisation. They're only supposed to be added in the second phase, after the import machinery has been appropriately configured.
Diffstat (limited to 'Python')
-rw-r--r--Python/pylifecycle.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index a9b9470..958219b 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -325,11 +325,6 @@ initimport(PyInterpreterState *interp, PyObject *sysmod)
/* Install importlib as the implementation of import */
value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod);
- if (value != NULL) {
- Py_DECREF(value);
- value = PyObject_CallMethod(importlib,
- "_install_external_importers", "");
- }
if (value == NULL) {
PyErr_Print();
return _Py_INIT_ERR("importlib install failed");