Jan 9, 2024 · Jan 9, 2024
diff --git a/Lib/asyncio/taskgroups.py b/Lib/asyncio/taskgroups.py
                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:
        if propagate_cancellation_error and not self._errors:
            raise propagate_cancellation_error

        if et is not None andet isnot exceptions.CancelledError:
        if et is not None and notissubclass(et,exceptions.CancelledError):
            self._errors.append(exc)

        if self._errors:
diff --git a/Lib/asyncio/timeouts.py b/Lib/asyncio/timeouts.py
        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
 :func:`asyncio.TaskGroup()` and :func:`asyncio.timeout()` context managers
 now handle :exc:`~asyncio.CancelledError` subclasses as well as exact
 :exc:`!CancelledError`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,8 +73,10 @@ async def __aexit__(self, et, exc, tb):
		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:
Expand DownExpand Up		@@ -133,7 +135,7 @@ async def __aexit__(self, et, exc, tb):
		if propagate_cancellation_error and not self._errors:
		raise propagate_cancellation_error

		if et is not None andet isnot exceptions.CancelledError:
		if et is not None and notissubclass(et,exceptions.CancelledError):
		self._errors.append(exc)

		if self._errors:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -109,10 +109,11 @@ async def __aexit__(
		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

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -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`.