Always load the missing module in XI data situations.

Author: ericsnowcurrently

Modules/_interpchannelsmodule.c

@@ -254,10 +254,10 @@ _get_current_module_state(void)
 {
     PyObject *mod = _get_current_module();
     if (mod == NULL) {
-        // XXX import it?
-        PyErr_SetString(PyExc_RuntimeError,
-                        MODULE_NAME_STR " module not imported yet");
-        return NULL;
+        mod = PyImport_ImportModule(MODULE_NAME_STR);
+        if (mod == NULL) {
+            return NULL;
+        }
     }
     module_state *state = get_module_state(mod);
     Py_DECREF(mod);

Modules/_interpqueuesmodule.c

@@ -1356,10 +1356,10 @@ _queueobj_from_xid(_PyXIData_t *data)
 
     PyObject *mod = _get_current_module();
     if (mod == NULL) {
-        // XXX import it?
-        PyErr_SetString(PyExc_RuntimeError,
-                        MODULE_NAME_STR " module not imported yet");
-        return NULL;
+        mod = PyImport_ImportModule(MODULE_NAME_STR);
+        if (mod == NULL) {
+            return NULL;
+        }
     }
 
     PyTypeObject *cls = get_external_queue_type(mod);

Modules/_interpretersmodule.c

@@ -316,15 +316,10 @@ get_module_state(PyObject *mod)
 }
 
 static module_state *
-_get_current_module_state(int force)
+_get_current_module_state(void)
 {
     PyObject *mod = _get_current_module();
     if (mod == NULL) {
-        if (!force) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            MODULE_NAME_STR " module not imported yet");
-            return NULL;
-        }
         mod = PyImport_ImportModule(MODULE_NAME_STR);
         if (mod == NULL) {
             return NULL;
@@ -357,8 +352,7 @@ clear_module_state(module_state *state)
 static PyTypeObject *
 _get_current_xibufferview_type(void)
 {
-    int force = 1;
-    module_state *state = _get_current_module_state(force);
+    module_state *state = _get_current_module_state();
     if (state == NULL) {
         return NULL;
     }

Python/import.c

@@ -3964,8 +3964,10 @@ PyImport_Import(PyObject *module_name)
     if (globals != NULL) {
         Py_INCREF(globals);
         builtins = PyObject_GetItem(globals, &_Py_ID(__builtins__));
-        if (builtins == NULL)
+        if (builtins == NULL) {
+            // XXX Fall back to interp->builtins or sys.modules['builtins']?
             goto err;
+        }
     }
     else {
         /* No globals -- use standard builtins, and fake globals */