8000 Fix CI · python/cpython@9014947 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9014947

Browse files
committed
Fix CI
1 parent 5c4a8f9 commit 9014947

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Python/crossinterp.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@ _PyXI_Enter(_PyXI_session *session,
26412641
xidata_fallback_t fallback = _PyXIDATA_XIDATA_ONLY;
26422642
_PyXI_failure _err = XI_FAILURE_INIT;
26432643
if (_fill_sharedns(sharedns, nsupdates, fallback, &_err) < 0) {
2644-
assert(_PyErr_Occurred(_PyThreadState_GET()));
2644+
assert(PyErr_Occurred());
26452645
if (_err.code == _PyXI_ERR_NO_ERROR) {
26462646
_err.code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
26472647
}
@@ -2659,7 +2659,6 @@ _PyXI_Enter(_PyXI_session *session,
26592659
_enter_session(session, interp);
26602660
_PyXI_failure override = XI_FAILURE_INIT;
26612661
override.code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
2662-
tstate = _PyThreadState_GET();
26632662

26642663
// Ensure this thread owns __main__.
26652664
if (_PyInterpreterState_SetRunningMain(interp) < 0) {
@@ -2684,7 +2683,7 @@ _PyXI_Enter(_PyXI_session *session,
26842683
}
26852684

26862685
override.code = _PyXI_ERR_NO_ERROR;
2687-
assert(!_PyErr_Occurred(tstate));
2686+
assert(!PyErr_Occurred());
26882687
return 0;
26892688

26902689
error:
@@ -2695,7 +2694,6 @@ _PyXI_Enter(_PyXI_session *session,
26952694

26962695
// Exit the session.
26972696
_exit_session(session);
2698-
tstate = _PyThreadState_GET();
26992697

27002698
if (sharedns != NULL) {
27012699
_destroy_sharedns(sharedns);
@@ -2715,7 +2713,7 @@ _PyXI_Enter(_PyXI_session *session,
27152713
Py_DECREF(excinfo);
27162714
}
27172715
}
2718-
assert(_PyErr_Occurred(tstate));
2716+
assert(PyErr_Occurred());
27192717

27202718
return -1;
27212719
}

0 commit comments

Comments
 (0)
0