diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2024-01-09 19:41:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 19:41:31 (GMT) |
| commit | a5db6a3351b440a875a5af84a8b2447981356e34 (patch) | |
| tree | 1add2b8a6ef3511e9f2480d6bad8c48f5cdab768 | |
| parent | 5273655bea050432756098641b9fda72361bf983 (diff) | |
| download | cpython-a5db6a3351b440a875a5af84a8b2447981356e34.zip cpython-a5db6a3351b440a875a5af84a8b2447981356e34.tar.gz cpython-a5db6a3351b440a875a5af84a8b2447981356e34.tar.bz2 | |
gh-113848: Handle CancelledError subclasses in asyncio TaskGroup() and timeout() (GH-113850)
| -rw-r--r-- | Lib/asyncio/taskgroups.py | 8 | ||||
| -rw-r--r-- | Lib/asyncio/timeouts.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2024-01-09-12-19-55.gh-issue-113848.kXoCy0.rst | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/Lib/asyncio/taskgroups.py b/Lib/asyncio/taskgroups.py index cb9c1ce..e1c56d1 100644 --- a/Lib/asyncio/taskgroups.py +++ b/Lib/asyncio/taskgroups.py @@ -73,8 +73,10 @@ class TaskGroup: self._base_error is None): self._base_error = exc - propagate_cancellation_error = \ - exc if et is exceptions.CancelledError else None + if et is not None and issubclass(et, exceptions.CancelledError): + propagate_cancellation_error = exc + else: + propagate_cancellation_error = None if self._parent_cancel_requested: # If this flag is set we *must* call uncancel(). if self._parent_task.uncancel() == 0: @@ -133,7 +135,7 @@ class TaskGroup: if propagate_cancellation_error and not self._errors: raise propagate_cancellation_error - if et is not None and et is not exceptions.CancelledError: + if et is not None and not issubclass(et, exceptions.CancelledError): self._errors.append(exc) if self._errors: diff --git a/Lib/asyncio/timeouts.py b/Lib/asyncio/timeouts.py index 30042ab..2c5dd29 100644 --- a/Lib/asyncio/timeouts.py +++ b/Lib/asyncio/timeouts.py @@ -109,10 +109,11 @@ class Timeout: if self._state is _State.EXPIRING: self._state = _State.EXPIRED - if self._task.uncancel() <= self._cancelling and exc_type is exceptions.CancelledError: - # Since there are no new cancel requests, we're - # handling this. - raise TimeoutError from exc_val + if self._task.uncancel() <= self._cancelling and exc_type is not None: + if issubclass(exc_type, exceptions.CancelledError): + # Since there are no new cancel requests, we're + # handling this. + raise TimeoutError from exc_val elif self._state is _State.ENTERED: self._state = _State.EXITED diff --git a/Misc/NEWS.d/next/Library/2024-01-09-12-19-55.gh-issue-113848.kXoCy0.rst b/Misc/NEWS.d/next/Library/2024-01-09-12-19-55.gh-issue-113848.kXoCy0.rst new file mode 100644 index 0000000..8d5032a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-01-09-12-19-55.gh-issue-113848.kXoCy0.rst @@ -0,0 +1,3 @@ +:func:`asyncio.TaskGroup()` and :func:`asyncio.timeout()` context managers +now handle :exc:`~asyncio.CancelledError` subclasses as well as exact +:exc:`!CancelledError`. |