[pull] master from aio-libs:master

CHANGES/10959.feature.rst

@@ -0,0 +1 @@
+9732.feature.rst

aiohttp/client.py

@@ -296,7 +296,7 @@ def __init__(
         max_line_size: int = 8190,
         max_field_size: int = 8190,
         fallback_charset_resolver: _CharsetResolver = lambda r, b: "utf-8",
-        middlewares: Optional[Sequence[ClientMiddlewareType]] = None,
+        middlewares: Sequence[ClientMiddlewareType] = (),
     ) -> None:
         # We initialise _connector to None immediately, as it's referenced in __del__()
         # and could cause issues if an exception occurs during initialisation.

docs/client_reference.rst

@@ -53,7 +53,7 @@ The client session supports the context manager protocol for self closing.
                          trust_env=False, \
                          requote_redirect_url=True, \
                          trace_configs=None, \
-                         middlewares=None, \
+                         middlewares=(), \
                          read_bufsize=2**16, \
                          max_line_size=8190, \
                          max_field_size=8190, \
@@ -216,7 +216,7 @@ The client session supports the context manager protocol for self closing.
 
    :param middlewares: A sequence of middleware instances to apply to all session requests.
                       Each middleware must match the :type:`ClientMiddlewareType` signature.
-                      ``None`` (default) is used when no middleware is needed.
+                      ``()`` (empty tuple, default) is used when no middleware is needed.
                       See :ref:`aiohttp-client-middleware` for more information.
 
       .. versionadded:: 3.12

tests/test_client_middleware.py

@@ -793,6 +793,8 @@ async def blocking_middleware(
     # Check that no connections were leaked
     assert len(connector._conns) == 0
 
+    await connector.close()
+
 
 async def test_client_middleware_blocks_connection_without_dns_lookup(
     aiohttp_server: AiohttpServer,

tests/test_proxy_functional.py

@@ -463,6 +463,7 @@ async def test_proxy_http_acquired_cleanup(
     assert 0 == len(conn._acquired)
 
     await sess.close()
+    await conn.close()
 
 
 @pytest.mark.skip("we need to reconsider how we test this")
@@ -487,6 +488,7 @@ async def request() -> None:
     assert 0 == len(conn._acquired)
 
     await sess.close()
+    await conn.close()
 
 
 @pytest.mark.skip("we need to reconsider how we test this")
@@ -521,6 +523,7 @@ async def request(pid: int) -> ClientResponse:
     assert {resp.status for resp in responses} == {200}
 
     await sess.close()
+    await conn.close()
 
 
 @pytest.mark.xfail

tests/test_web_sendfile_functional.py

@@ -625,6 +625,7 @@ async def test_static_file_ssl(
 
     resp.release()
     await client.close()
+    await conn.close()
 
 
 async def test_static_file_directory_traversal_attack(