Merge branch 'main' into patch-1

python · hugovk · Jul 19, 2025 · May 30, 2025 · Jul 19, 2025 · Jul 19, 2025
commit df30e9d4054df0e1597828b952ea7dd813bbe0be
@@ -665,19 +665,9 @@ _run_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
     _PyXI_session_result result = {0};
 
     // Prep and switch interpreters.
-    if (_PyXI_Enter(session, interp, shareables) < 0) {
-        if (_PyErr_Occurred(tstate)) {
-            // If an error occurred at this step, it means that interp
-            // was not prepared and switched.
-            _PyXI_FreeSession(session);
-            return -1;
-        }
-        // Now, apply the error from another interpreter:
-        PyObject *excinfo = _PyXI_ApplyCapturedException(session);
-        if (excinfo != NULL) {
-            *p_excinfo = excinfo;
-        }
-        assert(PyErr_Occurred());
+    if (_PyXI_Enter(session, interp, shareables, &result) < 0) {
+        // If an error occurred at this step, it means that interp
+        // was not prepared and switched.
         _PyXI_FreeSession(session);
         _PyXI_FreeFailure(failure);
         assert(result.excinfo == NULL);