https://github.com/python/cpython/commit/5273655bea050432756098641b9fda72361bf983
commit: 5273655bea050432756098641b9fda72361bf983
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-01-09T21:41:02+02:00
summary:
gh-113848: Use PyErr_GivenExceptionMatches() for check for CancelledError
(GH-113849)
files:
M Modules/_asynciomodule.c
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 3a11cdc926f138..b929e6d9922b4e 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -2754,7 +2754,6 @@ gen_status_from_result(PyObject **result)
static PyObject *
task_step_impl(asyncio_state *state, TaskObj *task, PyObject *exc)
{
- int res;
int clear_exc = 0;
PyObject *result = NULL;
PyObject *coro;
@@ -2771,20 +2770,7 @@ task_step_impl(asyncio_state *state, TaskObj *task,
PyObject *exc)
if (task->task_must_cancel) {
assert(exc != Py_None);
- if (exc) {
- /* Check if exc is a CancelledError */
- res = PyObject_IsInstance(exc, state->asyncio_CancelledError);
- if (res == -1) {
- /* An error occurred, abort */
- goto fail;
- }
- if (res == 0) {
- /* exc is not CancelledError; reset it to NULL */
- exc = NULL;
- }
- }
-
- if (!exc) {
+ if (!exc || !PyErr_GivenExceptionMatches(exc,
state->asyncio_CancelledError)) {
/* exc was not a CancelledError */
exc = create_cancelled_error(state, (FutureObj*)task);
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
