Merge 3.11

aio-libs · Sep 24, 2024 · 5d03181 · 5d03181
2 parents a4f9eca + 8f43a4f
commit 5d03181
Show file tree

Hide file tree

Showing 64 changed files with 494 additions and 87 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
diff --git a/CHANGES/4414.doc b/CHANGES/4414.doc
diff --git a/CHANGES/4650.bugfix b/CHANGES/4650.bugfix
diff --git a/CHANGES/5343.bugfix b/CHANGES/5343.bugfix
diff --git a/CHANGES/6485.bugfix.rst b/CHANGES/6485.bugfix.rst
diff --git a/CHANGES/6494.bugfix.rst b/CHANGES/6494.bugfix.rst
diff --git a/CHANGES/6732.bugfix b/CHANGES/6732.bugfix
diff --git a/CHANGES/6764.doc.rst b/CHANGES/6764.doc.rst
diff --git a/CHANGES/6807.bugfix.rst b/CHANGES/6807.bugfix.rst
diff --git a/CHANGES/7167.bugfix.rst b/CHANGES/7167.bugfix.rst
diff --git a/CHANGES/8564.feature.rst b/CHANGES/8564.feature.rst
diff --git a/CHANGES/8748.feature.rst b/CHANGES/8748.feature.rst
diff --git a/CHANGES/8768.bugfix.rst b/CHANGES/8768.bugfix.rst
diff --git a/CHANGES/8823.bugfix.rst b/CHANGES/8823.bugfix.rst
diff --git a/CHANGES/8845.bugfix.rst b/CHANGES/8845.bugfix.rst
diff --git a/CHANGES/8847.misc.rst b/CHANGES/8847.misc.rst
diff --git a/CHANGES/8858.bugfix.rst b/CHANGES/8858.bugfix.rst
diff --git a/CHANGES/8875.bugfix.rst b/CHANGES/8875.bugfix.rst
diff --git a/CHANGES/8876.bugfix.rst b/CHANGES/8876.bugfix.rst
diff --git a/CHANGES/8878.bugfix.rst b/CHANGES/8878.bugfix.rst
diff --git a/CHANGES/8898.bugfix.rst b/CHANGES/8898.bugfix.rst
diff --git a/CHANGES/8908.bugfix.rst b/CHANGES/8908.bugfix.rst
diff --git a/CHANGES/8929.bugfix.rst b/CHANGES/8929.bugfix.rst
diff --git a/CHANGES/8947.misc.rst b/CHANGES/8947.misc.rst
diff --git a/CHANGES/8967.bugfix.rst b/CHANGES/8967.bugfix.rst
diff --git a/CHANGES/8968.doc.rst b/CHANGES/8968.doc.rst
diff --git a/CHANGES/8990.bugfix.rst b/CHANGES/8990.bugfix.rst
diff --git a/CHANGES/8991.doc.rst b/CHANGES/8991.doc.rst
diff --git a/CHANGES/8992.bugfix.rst b/CHANGES/8992.bugfix.rst
diff --git a/CHANGES/8998.bugfix.rst b/CHANGES/8998.bugfix.rst
diff --git a/CHANGES/9004.packaging.rst b/CHANGES/9004.packaging.rst
diff --git a/CHANGES/9018.bugfix.rst b/CHANGES/9018.bugfix.rst
diff --git a/CHANGES/9029.bugfix.rst b/CHANGES/9029.bugfix.rst
diff --git a/CHANGES/9030.bugfix.rst b/CHANGES/9030.bugfix.rst
diff --git a/CHANGES/9031.misc.rst b/CHANGES/9031.misc.rst
diff --git a/CHANGES/9032.bugfix.rst b/CHANGES/9032.bugfix.rst
diff --git a/CHANGES/9052.bugfix.rst b/CHANGES/9052.bugfix.rst
diff --git a/CHANGES/9054.misc.rst b/CHANGES/9054.misc.rst
diff --git a/CHANGES/9063.bugfix.rst b/CHANGES/9063.bugfix.rst
diff --git a/CHANGES/9068.misc.rst b/CHANGES/9068.misc.rst
diff --git a/CHANGES/9095.misc.rst b/CHANGES/9095.misc.rst
diff --git a/CHANGES/9108.bugfix.rst b/CHANGES/9108.bugfix.rst
diff --git a/CHANGES/9137.bugfix.rst b/CHANGES/9137.bugfix.rst
diff --git a/CHANGES/9140.bugfix.rst b/CHANGES/9140.bugfix.rst
diff --git a/CHANGES/9158.misc.rst b/CHANGES/9158.misc.rst
diff --git a/CHANGES/9160.bugfix b/CHANGES/9160.bugfix
diff --git a/CHANGES/9167.bugfix.rst b/CHANGES/9167.bugfix.rst
diff --git a/CHANGES/9168.misc.rst b/CHANGES/9168.misc.rst
diff --git a/CHANGES/9169.misc.rst b/CHANGES/9169.misc.rst
diff --git a/CHANGES/9170.misc.rst b/CHANGES/9170.misc.rst
diff --git a/CHANGES/9172.misc.rst b/CHANGES/9172.misc.rst
diff --git a/CHANGES/9173.misc.rst b/CHANGES/9173.misc.rst
diff --git a/CHANGES/9174.misc.rst b/CHANGES/9174.misc.rst
diff --git a/CHANGES/9175.misc.rst b/CHANGES/9175.misc.rst
diff --git a/CHANGES/9200.breaking.rst b/CHANGES/9200.breaking.rst
diff --git a/CHANGES/9203.misc.rst b/CHANGES/9203.misc.rst
diff --git a/CHANGES/9204.misc.rst b/CHANGES/9204.misc.rst
diff --git a/CHANGES/9239.bugfix.rst b/CHANGES/9239.bugfix.rst
diff --git a/CHANGES/9241.misc.rst b/CHANGES/9241.misc.rst
diff --git a/CHANGES/9267.breaking.rst b/CHANGES/9267.breaking.rst
diff --git a/CHANGES/9267.bugfix.rst b/CHANGES/9267.bugfix.rst
diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -780,7 +780,7 @@ def ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Collection[str] = (),
-        timeout: Union[ClientWSTimeout, float, _SENTINEL, None] = sentinel,
+        timeout: Union[ClientWSTimeout, _SENTINEL] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -828,7 +828,7 @@ async def _ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Collection[str] = (),
-        timeout: Union[ClientWSTimeout, float, _SENTINEL, None] = sentinel,
+        timeout: Union[ClientWSTimeout, _SENTINEL] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -845,9 +845,7 @@ async def _ws_connect(
         compress: int = 0,
         max_msg_size: int = 4 * 1024 * 1024,
     ) -> ClientWebSocketResponse:
-        if timeout is sentinel or timeout is None:
-            ws_timeout = DEFAULT_WS_CLIENT_TIMEOUT
-        else:
+        if timeout is not sentinel:
             if isinstance(timeout, ClientWSTimeout):
                 ws_timeout = timeout
             else:
@@ -859,7 +857,8 @@ async def _ws_connect(
                     stacklevel=2,
                 )
                 ws_timeout = ClientWSTimeout(ws_close=timeout)
-
+        else:
+            ws_timeout = DEFAULT_WS_CLIENT_TIMEOUT
         if receive_timeout is not None:
             warnings.warn(
                 "float parameter 'receive_timeout' "

diff --git a/aiohttp/client_ws.py b/aiohttp/client_ws.py
@@ -68,7 +68,7 @@ def __init__(
         self._closed = False
         self._closing = False
         self._close_code: Optional[int] = None
-        self._timeout: ClientWSTimeout = timeout
+        self._timeout = timeout
         self._autoclose = autoclose
         self._autoping = autoping
         self._heartbeat = heartbeat

diff --git a/docs/client_reference.rst b/docs/client_reference.rst
@@ -635,8 +635,8 @@ The client session supports the context manager protocol for self closing.
                               <ClientResponse>` object.
 
    .. method:: ws_connect(url, *, method='GET', \
-                            protocols=(), timeout=10.0,\
-                            receive_timeout=None,\
+                            protocols=(), \
+                            timeout=sentinel,\
                             auth=None,\
                             autoclose=True,\
                             autoping=True,\
@@ -659,12 +659,11 @@ The client session supports the context manager protocol for self closing.
 
       :param tuple protocols: Websocket protocols
 
-      :param float timeout: Timeout for websocket to close. ``10`` seconds
-                            by default
-
-      :param float receive_timeout: Timeout for websocket to receive
-                                    complete message.  ``None`` (unlimited)
-                                    seconds by default
+      :param timeout: a :class:`ClientWSTimeout` timeout for websocket.
+                      By default, the value
+                      `ClientWSTimeout(ws_receive=None, ws_close=10.0)` is used
+                      (``10.0`` seconds for the websocket to close).
+                      ``None`` means no timeout will be used.
 
       :param aiohttp.BasicAuth auth: an object that represents HTTP
                                      Basic Authorization (optional)
@@ -1705,7 +1704,22 @@ Utilities
 
       :class:`float`, ``None`` by default.
 
-   .. versionadded:: 3.3
+
+.. class:: ClientWSTimeout(*, ws_receive=None, ws_close=None)
+
+   A data class for websocket client timeout settings.
+
+   .. attribute:: ws_receive
+
+      A timeout for websocket to receive a complete message.
+
+      :class:`float`, ``None`` by default.
+
+   .. attribute:: ws_close
+
+      A timeout for the websocket to close.
+
+      :class:`float`, ``10.0`` by default.
 
 
    .. note::