Merge 3.9 into master

aio-libs · Feb 12, 2023 · 3a8e65f · 3a8e65f
1 parent fecbe99
commit 3a8e65f
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 44 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,21 @@
 
 .. towncrier release notes start
 
+3.8.4 (2023-02-12)
+==================
+
+Bugfixes
+--------
+
+- Fixed incorrectly overwriting cookies with the same name and domain, but different path.
+  `#6638 <https://github.com/aio-libs/aiohttp/issues/6638>`_
+- Fixed ``ConnectionResetError`` not being raised after client disconnection in SSL environments.
+  `#7180 <https://github.com/aio-libs/aiohttp/issues/7180>`_
+
+
+----
+
+
 3.8.3 (2022-09-21)
 ==================
 

diff --git a/CHANGES/3828.feature b/CHANGES/3828.feature
diff --git a/CHANGES/5494.bugfix b/CHANGES/5494.bugfix
diff --git a/CHANGES/5494.misc b/CHANGES/5494.misc
diff --git a/CHANGES/6189.bugfix b/CHANGES/6189.bugfix
diff --git a/CHANGES/6195.bugfix b/CHANGES/6195.bugfix
diff --git a/CHANGES/6201.bugfix b/CHANGES/6201.bugfix
diff --git a/CHANGES/6205.misc b/CHANGES/6205.misc
diff --git a/CHANGES/6240.doc b/CHANGES/6240.doc
diff --git a/CHANGES/6274.doc.rst b/CHANGES/6274.doc.rst
diff --git a/CHANGES/6276.doc b/CHANGES/6276.doc
diff --git a/CHANGES/6278.doc b/CHANGES/6278.doc
diff --git a/CHANGES/6305.bugfix b/CHANGES/6305.bugfix
diff --git a/CHANGES/6638.bugfix b/CHANGES/6638.bugfix
diff --git a/CHANGES/7180.bugfix b/CHANGES/7180.bugfix
diff --git a/README.rst b/README.rst
@@ -157,7 +157,6 @@ Please add *aiohttp* tag to your question there.
 Requirements
 ============
 
-- Python >= 3.7
 - async-timeout_
 - charset-normalizer_
 - multidict_

diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -288,21 +288,16 @@ def __init_subclass__(cls: Type["ClientSession"]) -> None:
         )
 
     def __del__(self, _warnings: Any = warnings) -> None:
-        try:
-            if not self.closed:
-                _warnings.warn(
-                    f"Unclosed client session {self!r}",
-                    ResourceWarning,
-                    source=self,
-                )
-                context = {"client_session": self, "message": "Unclosed client session"}
-                if self._source_traceback is not None:
-                    context["source_traceback"] = self._source_traceback
-                self._loop.call_exception_handler(context)
-        except AttributeError:
-            # loop was not initialized yet,
-            # either self._connector or self._loop doesn't exist
-            pass
+        if not self.closed:
+            _warnings.warn(
+                f"Unclosed client session {self!r}",
+                ResourceWarning,
+                source=self,
+            )
+            context = {"client_session": self, "message": "Unclosed client session"}
+            if self._source_traceback is not None:
+                context["source_traceback"] = self._source_traceback
+            self._loop.call_exception_handler(context)
 
     def request(
         self, method: str, url: StrOrURL, **kwargs: Any

diff --git a/docs/index.rst b/docs/index.rst
@@ -148,7 +148,6 @@ Continuous Integration.
 Dependencies
 ============
 
-- Python 3.7+
 - *async_timeout*
 - *charset-normalizer*
 - *multidict*

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -39,7 +39,6 @@ BodyPartReader
 boolean
 botocore
 brotli
-brotli
 Brotli
 brotlipy
 bugfix

diff --git a/setup.cfg b/setup.cfg
@@ -52,7 +52,7 @@ install_requires =
   async_timeout >= 4.0, < 5.0
   asynctest == 0.13.0; python_version<"3.8"
   yarl >= 1.0, < 2.0
-  typing_extensions >= 3.7.4
+  typing_extensions >= 3.7.4; python_version<"3.8"
   frozenlist >= 1.1.1
   aiosignal >= 1.1.2
 

diff --git a/tests/test_connector.py b/tests/test_connector.py
@@ -2023,8 +2023,7 @@ async def handler(request):
     session = aiohttp.ClientSession(connector=conn)
     url = srv.make_url("/")
 
-    err = aiohttp.ClientConnectorCertificateError
-    with pytest.raises(err) as ctx:
+    with pytest.raises(aiohttp.ClientConnectorCertificateError) as ctx:
         await session.get(url)
 
     assert isinstance(ctx.value, aiohttp.ClientConnectorCertificateError)