Skip to content

Commit

Permalink
Fix StreamResponse.prepared not returning True after EOF is sent (#5344)
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurdarcet authored Aug 26, 2024
1 parent fa1261d commit bff7631
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGES/5343.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed StreamResponse.prepared to return True after EOF is sent -- by :user:`arthurdarcet`.
2 changes: 1 addition & 1 deletion aiohttp/web_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]]":
Expand Down
15 changes: 10 additions & 5 deletions tests/test_web_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -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>"

Expand Down Expand Up @@ -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


Expand Down

0 comments on commit bff7631

Please sign in to comment.