From 62f840bdddd8412faced4042d5cce3a90eb041d3 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 4 Oct 2024 13:52:13 -0500 Subject: [PATCH] [3.11] Fix duplicate cancelling check in TimerContext due to merge conflict error --- aiohttp/helpers.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py index bc626fd939..81b79792de 100644 --- a/aiohttp/helpers.py +++ b/aiohttp/helpers.py @@ -681,12 +681,6 @@ def __enter__(self) -> BaseTimerContext: # raise asyncio.TimeoutError or let the cancellation propagate self._cancelling = task.cancelling() - if sys.version_info >= (3, 11): - # Remember if the task was already cancelling - # so when we __exit__ we can decide if we should - # raise asyncio.TimeoutError or let the cancellation propagate - self._cancelling = task.cancelling() - if self._cancelled: raise asyncio.TimeoutError from None