mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #27419: Added temporary workaround for subinterpreters.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-07-17 14:16:04 +03:00
commit caaf53e748
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/import.c
View file

@ -1557,7 +1557,10 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
_PyImport_AcquireLock(); _PyImport_AcquireLock();
#endif #endif
/* From this point forward, goto error_with_unlock! */ /* From this point forward, goto error_with_unlock! */
builtins_import = _PyDict_GetItemId(interp->builtins_copy, &PyId___import__); /* XXX interp->builtins_copy is NULL in subinterpreter! */
builtins_import = _PyDict_GetItemId(interp->builtins_copy ?
interp->builtins_copy :
interp->builtins, &PyId___import__);
if (builtins_import == NULL) { if (builtins_import == NULL) {
PyErr_SetString(PyExc_ImportError, "__import__ not found"); PyErr_SetString(PyExc_ImportError, "__import__ not found");
goto error_with_unlock; goto error_with_unlock;