diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2017-09-14 06:46:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 06:46:04 (GMT) |
| commit | 93c92f7d1dbb6e7e472f1d0444c6968858113de2 (patch) | |
| tree | 031230f9b0cf2e8a8ef21f7fc40c4f5f98d20c6c /Python/ceval.c | |
| parent | 13ad3b7a82bf56d803fbe48ee5df6c4b08986c78 (diff) | |
| download | cpython-93c92f7d1dbb6e7e472f1d0444c6968858113de2.zip cpython-93c92f7d1dbb6e7e472f1d0444c6968858113de2.tar.gz cpython-93c92f7d1dbb6e7e472f1d0444c6968858113de2.tar.bz2 | |
bpo-31404: Revert "remove modules from Py_InterpreterState (#1638)" (#3565)
PR #1638, for bpo-28411, causes problems in some (very) edge cases. Until that gets sorted out, we're reverting the merge. PR #3506, a fix on top of #1638, is also getting reverted.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 5dd7cd9..08533a4 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4935,7 +4935,7 @@ import_from(PyObject *v, PyObject *name) Py_DECREF(pkgname); return NULL; } - x = _PyImport_GetModule(fullmodname); + x = PyDict_GetItem(PyImport_GetModuleDict(), fullmodname); Py_DECREF(fullmodname); if (x == NULL) { goto error; |