changeset:   102383:5540234ca517
parent:      102381:33593fcdf8b0
parent:      102382:4c07faa33915
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Jul 17 14:16:04 2016 +0300
files:       Python/import.c
description:
Issue #27419: Added temporary workaround for subinterpreters.


diff -r 33593fcdf8b0 -r 5540234ca517 Python/import.c
--- a/Python/import.c	Sun Jul 17 13:26:10 2016 +0300
+++ b/Python/import.c	Sun Jul 17 14:16:04 2016 +0300
@@ -1557,7 +1557,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;