Merge branch 'master' into dependabot/pip/idna-3.8

Author: bdraco

Diff for: CHANGES/5343.bugfix

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

Diff for: aiohttp/web_response.py

@@ -121,7 +121,7 @@ def __init__(
 
     @property
     def prepared(self) -> bool:
-        return self._payload_writer is not None
+        return self._eof_sent or self._payload_writer is not None
 
     @property
     def task(self) -> "Optional[asyncio.Task[None]]":

Diff for: requirements/constraints.txt

@@ -44,7 +44,7 @@ charset-normalizer==3.3.2
     # via requests
 cherry-picker==2.2.0
     # via -r requirements/dev.in
-click==8.1.6
+click==8.1.7
     # via
     #   cherry-picker
     #   pip-tools
@@ -260,7 +260,7 @@ trustme==1.1.0 ; platform_machine != "i686"
     #   -r requirements/test.in
 typer==0.12.5
     # via python-on-whales
-typing-extensions==4.10.0
+typing-extensions==4.12.2
     # via
     #   aioredis
     #   annotated-types

Diff for: requirements/dev.txt

@@ -44,7 +44,7 @@ charset-normalizer==3.3.2
     # via requests
 cherry-picker==2.2.0
     # via -r requirements/dev.in
-click==8.1.6
+click==8.1.7
     # via
     #   cherry-picker
     #   pip-tools
@@ -252,7 +252,7 @@ trustme==1.1.0 ; platform_machine != "i686"
     #   -r requirements/test.in
 typer==0.12.5
     # via python-on-whales
-typing-extensions==4.10.0
+typing-extensions==4.12.2
     # via
     #   aioredis
     #   annotated-types

Diff for: requirements/doc-spelling.txt

@@ -16,7 +16,7 @@ certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via towncrier
 docutils==0.20.1
     # via sphinx

Diff for: requirements/doc.txt

@@ -16,7 +16,7 @@ certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via towncrier
 docutils==0.20.1
     # via sphinx

Diff for: requirements/lint.txt

@@ -22,7 +22,7 @@ cfgv==3.4.0
     # via pre-commit
 charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via
     #   slotscheck
     #   typer
@@ -107,7 +107,7 @@ trustme==1.1.0
     # via -r requirements/lint.in
 typer==0.12.5
     # via python-on-whales
-typing-extensions==4.10.0
+typing-extensions==4.12.2
     # via
     #   aioredis
     #   annotated-types

Diff for: requirements/test.txt

@@ -24,7 +24,7 @@ cffi==1.17.0
     #   pycares
 charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via
     #   typer
     #   wait-for-it
@@ -119,7 +119,7 @@ trustme==1.1.0 ; platform_machine != "i686"
     # via -r requirements/test.in
 typer==0.12.5
     # via python-on-whales
-typing-extensions==4.10.0
+typing-extensions==4.12.2
     # via
     #   annotated-types
     #   mypy

Diff for: tests/test_web_response.py

@@ -734,11 +734,8 @@ async def test___repr___after_eof() -> None:
     resp = StreamResponse()
     await resp.prepare(make_request("GET", "/"))
 
-    assert resp.prepared
-
     await resp.write(b"data")
     await resp.write_eof()
-    assert not resp.prepared
     resp_repr = repr(resp)
     assert resp_repr == "<StreamResponse OK eof>"
 
@@ -1110,14 +1107,22 @@ def test_content_type_with_set_body() -> None:
     assert resp.content_type == "application/octet-stream"
 
 
-def test_started_when_not_started() -> None:
+def test_prepared_when_not_started() -> None:
     resp = StreamResponse()
     assert not resp.prepared
 
 
-async def test_started_when_started() -> None:
+async def test_prepared_when_started() -> None:
+    resp = StreamResponse()
+    await resp.prepare(make_request("GET", "/"))
+    assert resp.prepared
+
+
+async def test_prepared_after_eof() -> None:
     resp = StreamResponse()
     await resp.prepare(make_request("GET", "/"))
+    await resp.write(b"data")
+    await resp.write_eof()
     assert resp.prepared