commit 80ab069f1b040b7418833d9c1facf77ad2bd4363
author Serhiy Storchaka <storchaka@gmail.com> Sun Jul 17 14:15:28 2016 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Sun Jul 17 14:15:28 2016 +0300
tree d0e9b36135fe8bdeb98c7cb65b19d2b04eec395b
parent 6c2f1fd71075ced14e7ba40e232297ba878aadd1

Issue #27419: Added temporary workaround for subinterpreters.

Python/import.c

diff --git a/Python/import.c b/Python/import.c
index c1dc9a0..5025e75 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1526,7 +1526,10 @@
     _PyImport_AcquireLock();
 #endif
    /* 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) {
         PyErr_SetString(PyExc_ImportError, "__import__ not found");
         goto error_with_unlock;