From 0f1890089051b698e30fad203fe0cdc1367604fb Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 11 Nov 2024 11:40:12 -0600 Subject: [PATCH] Remove connector close workaround for older Python versions (#9818) --- aiohttp/connector.py | 4 ---- tests/test_connector.py | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/aiohttp/connector.py b/aiohttp/connector.py index 18f71ecafb8..a23c25a5b32 100644 --- a/aiohttp/connector.py +++ b/aiohttp/connector.py @@ -698,10 +698,6 @@ def _release( if self._force_close or should_close or protocol.should_close: transport = protocol.transport protocol.close() - # TODO: Remove once fixed: https://bugs.python.org/issue39951 - # See PR #6321 - set_result(protocol.closed, None) - if key.is_ssl and not self._cleanup_closed_disabled: self._cleanup_closed_transports.append(transport) return diff --git a/tests/test_connector.py b/tests/test_connector.py index fe09cb91af5..e31fb1dec46 100644 --- a/tests/test_connector.py +++ b/tests/test_connector.py @@ -586,18 +586,6 @@ async def test_release_close(key: ConnectionKey) -> None: await conn.close() -async def test_release_proto_closed_future( - loop: asyncio.AbstractEventLoop, key: ConnectionKey -) -> None: - conn = aiohttp.BaseConnector() - protocol = mock.Mock(should_close=True, closed=loop.create_future()) - conn._release(key, protocol) - # See PR #6321 - assert protocol.closed.result() is None - - await conn.close() - - async def test__release_acquired_per_host1( loop: asyncio.AbstractEventLoop, key: ConnectionKey ) -> None: