mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
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.
This commit is contained in:
parent
13ad3b7a82
commit
93c92f7d1d
21 changed files with 154 additions and 308 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue