[pull] master from aio-libs:master

CHANGES/13295.doc.rst

@@ -0,0 +1,3 @@
+Corrected the documented signature of :meth:`~aiohttp.StreamReader.read_nowait`,
+whose ``n`` parameter defaults to ``-1`` rather than the ``None`` that was
+previously documented -- by :user:`LALITH0110`.

CHANGES/13336.doc.rst

@@ -0,0 +1,2 @@
+Added ``interlock-cb``, an aiohttp client circuit breaker middleware, to the
+third-party libraries page -- by :user:`bagowix`.

CHANGES/13520.bugfix.rst

@@ -0,0 +1,5 @@
+Fixed Cython 3.3.0 failing to compile the WebSocket reader: dropped the
+``Final[...]`` annotation from ``ALLOWED_CLOSE_CODES`` and the ``int``
+annotation from the local ``start_pos`` in ``WebSocketReader._feed_data``,
+both of which conflicted with declarations in ``reader_c.pxd`` under
+Cython 3.3.0 -- by :user:`Georgefifth`.

CONTRIBUTORS.txt

@@ -155,6 +155,7 @@ Gary Leung
 Gary Wilson Jr.
 Gene Hoffman
 Gennady Andreyev
+George Fifth
 Georges Dubus
 goingforstudying-ctrl
 Greg Holt

aiohttp/_websocket/reader_py.py

@@ -4,7 +4,6 @@
 import builtins
 import sys
 from collections import deque
-from typing import Final
 
 from ..base_protocol import BaseProtocol
 from ..compression_utils import TooManyMembersError, ZLibDecompressor
@@ -25,7 +24,7 @@
     WSMsgType,
 )
 
-ALLOWED_CLOSE_CODES: Final[set[int]] = {int(i) for i in WSCloseCode}
+ALLOWED_CLOSE_CODES: set[int] = {int(i) for i in WSCloseCode}
 
 # States for the reader, used to parse the WebSocket frame
 # integer values are used so they can be cythonized
@@ -353,7 +352,7 @@ def _feed_data(self, data: bytes) -> None:
         if self._tail:
             data, self._tail = self._tail + data, b""
 
-        start_pos: int = 0
+        start_pos = 0
         data_len = len(data)
         data_cstr = data
 

docs/streams.rst

@@ -196,7 +196,7 @@ Helpers
 
    Return ``True`` if the buffer is empty and EOF was reached.
 
-.. method:: StreamReader.read_nowait(n=None)
+.. method:: StreamReader.read_nowait(n=-1)
 
    Returns data from internal buffer if any, empty bytes object otherwise.
 

docs/third_party.rst

@@ -302,3 +302,7 @@ ask to raise the status.
 
 - `aiointercept <https://github.com/Polandia94/aiointercept>`_
   Mock aiohttp HTTP requests by routing them through a real aiohttp.web test server.
+
+- `interlock-cb <https://github.com/bagowix/interlock>`_
+  Circuit breaker middleware for aiohttp clients with one breaker per host; it fails fast
+  while a host is degraded and trips on failure rate or slow responses.