Introduce resp.abort()

aiohttp/client_reqrep.py

@@ -921,6 +921,13 @@ def release(self) -> Any:
         self._cleanup_writer()
         return noop()
 
+    async def abort(self) -> None:
+        if not self._closed:
+            conn = self._connection
+            self.close()
+            if conn is not None:
+                await conn.cleanup()
+
     @property
     def ok(self) -> bool:
         """Returns ``True`` if ``status`` is less than ``400``, ``False`` if not.

aiohttp/client_ws.py

@@ -198,7 +198,7 @@ async def close(self, *, code: int = WSCloseCode.OK, message: bytes = b"") -> bo
                 return True
 
             if self._closing:
-                self._response.close()
+                await self._response.abort()
                 return True
 
             while True:
@@ -217,7 +217,7 @@ async def close(self, *, code: int = WSCloseCode.OK, message: bytes = b"") -> bo
 
                 if msg.type == WSMsgType.CLOSE:
                     self._close_code = msg.data
-                    self._response.close()
+                    await self._response.abort()
                     return True
         else:
             return False

aiohttp/connector.py

@@ -113,7 +113,7 @@ def _notify_release(self) -> None:
             with suppress(Exception):
                 cb()
 
-    async def close(self) -> None:
+    def close(self) -> None:
         self._notify_release()
 
         if not self._closed:
@@ -122,8 +122,6 @@ async def close(self) -> None:
             assert connector is not None
             # schedule cleanup if needed
             connector._release(self._key, proto, should_close=True)
-            # do actual closing, proto.close() supports reentrancy
-            await proto.close()
             self._closed = True
 
     def release(self) -> None:
@@ -140,6 +138,12 @@ def release(self) -> None:
     def closed(self) -> bool:
         return self._closed or not self.protocol.is_connected()
 
+    async def cleanup(self) -> None:
+        proto = self._protocol()
+        if proto is not None:
+            # do actual closing, proto.close() supports reentrancy
+            await proto.close()
+
 
 class _TransportPlaceholder:
     """placeholder for BaseConnector.connect function"""
@@ -290,7 +294,7 @@ async def _cleanup(self) -> None:
 
             assert isinstance(delay, Real), type(delay)
             when = now + delay
-            if delay >= 5:  # type: ignore[operator]
+            if delay >= 5:
                 when = ceil(when)
 
             try:

tests/test_client_connection.py

@@ -30,7 +30,7 @@ def protocol() -> Any:
 async def test_ctor(connector: Any, key: Any, protocol: Any) -> None:
     conn = Connection(connector, key, protocol)
     assert conn.protocol is protocol
-    await conn.close()
+    conn.close()
 
 
 async def test_callbacks_on_close(connector: Any, key: Any, protocol: Any) -> None:
@@ -42,7 +42,7 @@ def cb() -> None:
         notified = True
 
     conn.add_callback(cb)
-    await conn.close()
+    conn.close()
     assert notified
 
 
@@ -72,14 +72,14 @@ def cb2() -> None:
 
     conn.add_callback(cb1)
     conn.add_callback(cb2)
-    await conn.close()
+    conn.close()
     assert notified
 
 
 async def test_close(connector: Any, key: Any, protocol: Any) -> None:
     conn = Connection(connector, key, protocol)
     assert not conn.closed
-    await conn.close()
+    conn.close()
     # assert conn._protocol() is None
     connector._release.assert_called_with(key, protocol, should_close=True)
     assert conn.closed

tests/test_client_functional.py

@@ -2765,7 +2765,7 @@ def connection_lost(self, exc):
         await r.read()
         assert 0 == len(connector._conns)
     await session.close()
-    connector.close()
+    await connector.close()
     server.close()
     await server.wait_closed()
 
@@ -2807,7 +2807,7 @@ def connection_lost(self, exc):
     assert 0 == len(connector._conns)
 
     await session.close()
-    connector.close()
+    await connector.close()
     server.close()
     await server.wait_closed()