patchback/backports/3.11/1d170d37f476df705a9dcc3588e192e8ccb871c0/pr 7731

.codecov.yml

@@ -1,5 +1,5 @@
 codecov:
-  branch: 3.9
+  branch: master
   notify:
     after_n_builds: 13
 

.github/dependabot.yml

@@ -12,6 +12,8 @@ updates:
   # Maintain dependencies for Python
   - package-ecosystem: "pip"
     directory: "/"
+    allow:
+      - dependency-type: "all"
     labels:
       - dependencies
     schedule:
@@ -31,6 +33,8 @@ updates:
   # Maintain dependencies for Python aiohttp backport
   - package-ecosystem: "pip"
     directory: "/"
+    allow:
+      - dependency-type: "all"
     labels:
       - dependencies
     target-branch: "3.11"

.github/workflows/ci-cd.yml

@@ -125,15 +125,13 @@ jobs:
     needs: gen_llhttp
     strategy:
       matrix:
-        pyver: [3.8, 3.9, '3.10', '3.11', '3.12']
+        pyver: [3.9, '3.10', '3.11', '3.12']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         experimental: [false]
         exclude:
           - os: macos
             no-extensions: 'Y'
-          - os: macos
-            pyver: 3.8
           - os: windows
             no-extensions: 'Y'
         include:
@@ -198,7 +196,7 @@ jobs:
         PIP_USER: 1
       run: >-
         PATH="${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}"
-        pytest
+        pytest --junitxml=junit.xml
       shell: bash
     - name: Re-run the failing tests with maximum verbosity
       if: failure()
@@ -234,6 +232,11 @@ jobs:
             steps.python-install.outputs.python-version
           }}
         token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }}
+      uses: codecov/test-results-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   check:  # This job does nothing and is only used for the branch protection
     if: always()

.pre-commit-config.yaml

@@ -107,6 +107,7 @@ repos:
   - id: flake8
     additional_dependencies:
       - flake8-docstrings==1.6.0
+      - flake8-no-implicit-concat==0.3.4
       - flake8-requirements==1.7.8
     exclude: "^docs/"
 - repo: https://github.com/Lucas-C/pre-commit-hooks-markup

CHANGES/3945.deprecation.rst

@@ -0,0 +1 @@
+Deprecate obsolete `timeout: float` and `receive_timeout: Optional[float]` in `ClientSession.ws_connect()`. Change default websocket receive timeout from `None` to `10.0`.

CHANGES/5343.bugfix

@@ -0,0 +1 @@
+Fixed StreamResponse.prepared to return True after EOF is sent -- by :user:`arthurdarcet`.

CHANGES/6485.bugfix.rst

@@ -0,0 +1 @@
+Fixed ``Response.text`` when body is a ``Payload`` -- by :user:`Dreamsorcerer`.

CHANGES/6494.bugfix.rst

@@ -0,0 +1 @@
+Added support for URL credentials with empty (zero-length) username, e.g. ``https://:password@host`` -- by :user:`shuckc`

CHANGES/6732.bugfix

@@ -0,0 +1 @@
+Fixed handling of some file-like objects (e.g. ``tarfile.extractfile()``) which raise ``AttributeError`` instead of ``OSError`` when ``fileno`` fails for streaming payload data -- by :user:`ReallyReivax`.

CHANGES/6764.doc.rst

@@ -0,0 +1 @@
+Clarified that auth parameter in ClientSession will persist and be included with any request to any origin, even during redirects to different origins.  -- by :user:`MaximZemskov`.

CHANGES/6807.bugfix.rst

@@ -0,0 +1 @@
+Stopped logging exceptions from ``web.run_app()`` that would be raised regardless -- by :user:`Dreamsorcerer`.

CHANGES/7167.bugfix.rst

@@ -0,0 +1 @@
+Changed ``make_mocked_request()`` to use empty payload by default -- by :user:`rahulnht`.

CHANGES/7731.misc.rst

@@ -0,0 +1 @@
+Added flake8 settings to avoid some forms of implicit concatenation. -- by :user:`booniepepper`.

CHANGES/8612.feature.rst

@@ -0,0 +1 @@
+Exported ``ClientWSTimeout`` to top-level namespace -- by :user:`Dreamsorcerer`.

CHANGES/8768.bugfix.rst

@@ -0,0 +1 @@
+Used more precise type for ``ClientResponseError.headers``, fixing some type errors when using them -- by :user:`Dreamorcerer`.

CHANGES/8797.breaking.rst

@@ -0,0 +1 @@
+Dropped support for Python 3.8 -- by :user:`Dreamsorcerer`.

CHANGES/8823.bugfix.rst

@@ -0,0 +1 @@
+Fixed Python parser chunked handling with multiple Transfer-Encoding values -- by :user:`Dreamsorcerer`.

CHANGES/8845.bugfix.rst

@@ -0,0 +1 @@
+Changed behaviour when returning an invalid response to send a 500 response -- by :user:`Dreamsorcerer`.

CHANGES/8847.misc.rst

@@ -0,0 +1 @@
+Improved performance of making requests when there are no auto headers to skip -- by :user:`bdraco`.

CHANGES/8858.bugfix.rst

@@ -0,0 +1 @@
+Stopped adding a default Content-Type header when response has no content -- by :user:`Dreamsorcerer`.

CHANGES/8875.bugfix.rst

@@ -0,0 +1 @@
+Fixed an unclosed transport ``ResourceWarning`` on web handlers -- by :user:`Dreamsorcerer`.

CHANGES/8876.bugfix.rst

@@ -0,0 +1 @@
+Fixed error handling after 100-continue so server sends 500 response instead of disconnecting -- by :user:`Dreamsorcerer`.

CHANGES/8878.bugfix.rst

@@ -0,0 +1 @@
+Fixed response reading from closed session to throw an error immediately instead of timing out -- by :user:`Dreamsorcerer`.

CHANGES/8898.bugfix.rst

@@ -0,0 +1 @@
+Fixed web router not matching pre-encoded URLs (requires yarl 1.9.6+) -- by :user:`Dreamsorcerer`.

CHANGES/8908.bugfix.rst

@@ -0,0 +1 @@
+Fixed ``CancelledError`` from one cleanup context stopping other contexts from completing -- by :user:`Dreamsorcerer`.

CHANGES/8920.misc.rst

@@ -0,0 +1 @@
+Enabled keep-alive support on proxies (which was originally disabled several years ago) -- by :user:`Dreamsorcerer`.

CHANGES/8929.bugfix.rst

@@ -0,0 +1 @@
+Fixed ``Site.name`` when host is an empty string -- by :user:`Dreamsorcerer`.

CHANGES/8947.misc.rst

@@ -0,0 +1 @@
+Exported ``aiohttp.TraceRequestHeadersSentParams`` -- by :user:`Hadock-is-ok`.

CHANGES/8956.feature.rst

@@ -0,0 +1 @@
+Added ``secure``/``httponly``/``samesite`` parameters to ``.del_cookie()`` -- by :user:`Dreamsorcerer`.

CHANGES/8966.feature.rst

@@ -0,0 +1 @@
+Updated ClientSession's auth logic to include default auth only if the request URL's origin matches _base_url; otherwise, the auth will not be included -- by :user:`MaximZemskov`

CHANGES/8967.bugfix.rst

@@ -0,0 +1 @@
+Fixed resolve_host() 'Task was destroyed but is pending' errors -- by :user:`Dreamsorcerer`.

CHANGES/8968.doc.rst

@@ -0,0 +1 @@
+Clarified which timeout exceptions happen on which timeouts -- by :user:`Dreamsorcerer`.

CHANGES/8990.bugfix.rst

@@ -0,0 +1 @@
+Fixed changing scheme/host in ``Response.clone()`` for absolute URLs -- by :user:`Dreamsorcerer`.

CHANGES/8991.doc.rst

@@ -0,0 +1 @@
+Updated ``ClientSession`` parameters to match current code -- by :user:`Dreamsorcerer`.

CHANGES/8992.bugfix.rst

@@ -0,0 +1 @@
+Fixed client incorrectly reusing a connection when the previous message had not been fully sent -- by :user:`Dreamsorcerer`.

CONTRIBUTORS.txt

@@ -74,6 +74,7 @@ Chih-Yuan Chen
 Chris AtLee
 Chris Laws
 Chris Moore
+Chris Shucksmith
 Christopher Schmitt
 Claudiu Popa
 Colin Dunklau
@@ -273,6 +274,7 @@ Philipp A.
 Pieter van Beek
 Qiao Han
 Rafael Viotti
+Rahul Nahata
 Raphael Bialon
 Raúl Cumplido
 Required Field
@@ -352,6 +354,7 @@ William Grzybowski
 William S.
 Wilson Ong
 wouter bolsterlee
+Xavier Halloran
 Xiang Li
 Yang Zhou
 Yannick Koechlin

Makefile

@@ -112,11 +112,7 @@ define run_tests_in_docker
 	docker run --rm -ti -v `pwd`:/src -w /src "aiohttp-test-$(1)-$(2)" $(TEST_SPEC)
 endef
 
-.PHONY: test-3.8-no-extensions test-3.8 test-3.9-no-extensions test
-test-3.8-no-extensions:
-	$(call run_tests_in_docker,3.8,y)
-test-3.8:
-	$(call run_tests_in_docker,3.8,n)
+.PHONY: test-3.9-no-extensions test
 test-3.9-no-extensions:
 	$(call run_tests_in_docker,3.9,y)
 test-3.9:

aiohttp/__init__.py

@@ -21,6 +21,7 @@
     ClientSSLError,
     ClientTimeout,
     ClientWebSocketResponse,
+    ClientWSTimeout,
     ConnectionTimeoutError,
     ContentTypeError,
     Fingerprint,
@@ -106,6 +107,7 @@
     TraceRequestChunkSentParams as TraceRequestChunkSentParams,
     TraceRequestEndParams as TraceRequestEndParams,
     TraceRequestExceptionParams as TraceRequestExceptionParams,
+    TraceRequestHeadersSentParams as TraceRequestHeadersSentParams,
     TraceRequestRedirectParams as TraceRequestRedirectParams,
     TraceRequestStartParams as TraceRequestStartParams,
     TraceResponseChunkReceivedParams as TraceResponseChunkReceivedParams,
@@ -138,6 +140,7 @@
     "ClientSession",
     "ClientTimeout",
     "ClientWebSocketResponse",
+    "ClientWSTimeout",
     "ConnectionTimeoutError",
     "ContentTypeError",
     "Fingerprint",
@@ -224,6 +227,7 @@
     "TraceRequestChunkSentParams",
     "TraceRequestEndParams",
     "TraceRequestExceptionParams",
+    "TraceRequestHeadersSentParams",
     "TraceRequestRedirectParams",
     "TraceRequestStartParams",
     "TraceResponseChunkReceivedParams",

aiohttp/client.py

@@ -73,7 +73,11 @@
     RequestInfo as RequestInfo,
     _merge_ssl_params,
 )
-from .client_ws import ClientWebSocketResponse as ClientWebSocketResponse
+from .client_ws import (
+    DEFAULT_WS_CLIENT_TIMEOUT,
+    ClientWebSocketResponse as ClientWebSocketResponse,
+    ClientWSTimeout as ClientWSTimeout,
+)
 from .connector import (
     HTTP_AND_EMPTY_SCHEMA_SET,
     BaseConnector as BaseConnector,
@@ -142,6 +146,7 @@
     # client
     "ClientSession",
     "ClientTimeout",
+    "ClientWSTimeout",
     "request",
 )
 
@@ -305,15 +310,15 @@ def __init__(
             self._timeout = DEFAULT_TIMEOUT
             if read_timeout is not sentinel:
                 warnings.warn(
-                    "read_timeout is deprecated, " "use timeout argument instead",
+                    "read_timeout is deprecated, use timeout argument instead",
                     DeprecationWarning,
                     stacklevel=2,
                 )
                 self._timeout = attr.evolve(self._timeout, total=read_timeout)
             if conn_timeout is not None:
                 self._timeout = attr.evolve(self._timeout, connect=conn_timeout)
                 warnings.warn(
-                    "conn_timeout is deprecated, " "use timeout argument instead",
+                    "conn_timeout is deprecated, use timeout argument instead",
                     DeprecationWarning,
                     stacklevel=2,
                 )
@@ -592,7 +597,10 @@ async def _request(
 
                     if auth is None:
                         auth = auth_from_url
-                    if auth is None:
+
+                    if auth is None and (
+                        not self._base_url or self._base_url.origin() == url.origin()
+                    ):
                         auth = self._default_auth
                     # It would be confusing if we support explicit
                     # Authorization header with auth argument
@@ -627,7 +635,7 @@ async def _request(
                         url,
                         params=params,
                         headers=headers,
-                        skip_auto_headers=skip_headers,
+                        skip_auto_headers=skip_headers if skip_headers else None,
                         data=data,
                         cookies=all_cookies,
                         auth=auth,
@@ -820,7 +828,7 @@ def ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Iterable[str] = (),
-        timeout: float = 10.0,
+        timeout: Union[ClientWSTimeout, _SENTINEL] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -872,7 +880,7 @@ async def _ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Iterable[str] = (),
-        timeout: float = 10.0,
+        timeout: Union[ClientWSTimeout, _SENTINEL] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -891,6 +899,29 @@ async def _ws_connect(
         compress: int = 0,
         max_msg_size: int = 4 * 1024 * 1024,
     ) -> ClientWebSocketResponse:
+        if timeout is not sentinel:
+            if isinstance(timeout, ClientWSTimeout):
+                ws_timeout = timeout
+            else:
+                warnings.warn(
+                    "parameter 'timeout' of type 'float' "
+                    "is deprecated, please use "
+                    "'timeout=ClientWSTimeout(ws_close=...)'",
+                    DeprecationWarning,
+                    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' "
+                "is deprecated, please use parameter "
+                "'timeout=ClientWSTimeout(ws_receive=...)'",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            ws_timeout = attr.evolve(ws_timeout, ws_receive=receive_timeout)
 
         if headers is None:
             real_headers: CIMultiDict[str] = CIMultiDict()
@@ -1021,12 +1052,13 @@ async def _ws_connect(
 
             # For WS connection the read_timeout must be either receive_timeout or greater
             # None == no timeout, i.e. infinite timeout, so None is the max timeout possible
-            if receive_timeout is None:
+            if ws_timeout.ws_receive is None:
                 # Reset regardless
-                conn_proto.read_timeout = receive_timeout
+                conn_proto.read_timeout = None
             elif conn_proto.read_timeout is not None:
-                # If read_timeout was set check which wins
-                conn_proto.read_timeout = max(receive_timeout, conn_proto.read_timeout)
+                conn_proto.read_timeout = max(
+                    ws_timeout.ws_receive, conn_proto.read_timeout
+                )
 
             transport = conn.transport
             assert transport is not None
@@ -1050,11 +1082,10 @@ async def _ws_connect(
                 writer,
                 protocol,
                 resp,
-                timeout,
+                ws_timeout,
                 autoclose,
                 autoping,
                 self._loop,
-                receive_timeout=receive_timeout,
                 heartbeat=heartbeat,
                 compress=compress,
                 client_notakeover=notakeover,
@@ -1224,7 +1255,7 @@ def requote_redirect_url(self) -> bool:
     def requote_redirect_url(self, val: bool) -> None:
         """Do URL requoting on redirection handling."""
         warnings.warn(
-            "session.requote_redirect_url modification " "is deprecated #2778",
+            "session.requote_redirect_url modification is deprecated #2778",
             DeprecationWarning,
             stacklevel=2,
         )

aiohttp/client_exceptions.py

@@ -4,8 +4,10 @@
 import warnings
 from typing import TYPE_CHECKING, Optional, Tuple, Union
 
+from multidict import MultiMapping
+
 from .http_parser import RawResponseMessage
-from .typedefs import LooseHeaders, StrOrURL
+from .typedefs import StrOrURL
 
 try:
     import ssl
@@ -71,7 +73,7 @@ def __init__(
         code: Optional[int] = None,
         status: Optional[int] = None,
         message: str = "",
-        headers: Optional[LooseHeaders] = None,
+        headers: Optional[MultiMapping[str]] = None,
     ) -> None:
         self.request_info = request_info
         if code is not None:

aiohttp/client_proto.py

@@ -62,9 +62,6 @@ def should_close(self) -> bool:
             or bool(self._tail)
         )
 
-    def force_close(self) -> None:
-        self._should_close = True
-
     def close(self) -> None:
         transport = self.transport
         if transport is not None: