Skip to content

Fixed 7616: EmptyStreamReader.iter_chunks() never ends #7644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Fixed 7616: EmptyStreamReader.iter_chunks() never ends #7644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec5db45
Fixed 7616: An iteration of the chunks of an EmptyStreamReader with i…
mind1m Oct 3, 2023
75ca2b6
Merge branch 'master' into master
mind1m Oct 3, 2023
97bbdf0
Added iter to spelling whitelist
mind1m Oct 3, 2023
2dd996c
Update 7616.bugfix
Dreamsorcerer Oct 3, 2023
fb51f56
Update spelling_wordlist.txt
Dreamsorcerer Oct 3, 2023
f19a4f1
Update streams.py
Dreamsorcerer Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/7616.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed ``EmptyStreamReader.iter_chunks()`` never ending -- by :user:`mind1m`
6 changes: 5 additions & 1 deletion aiohttp/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def _read_nowait(self, n: int) -> bytes:

class EmptyStreamReader(StreamReader): # lgtm [py/missing-call-to-init]
def __init__(self) -> None:
pass
self._read_eof_chunk = False

def __repr__(self) -> str:
return "<%s>" % self.__class__.__name__
Expand Down Expand Up @@ -535,6 +535,10 @@ async def readany(self) -> bytes:
return b""

async def readchunk(self) -> Tuple[bytes, bool]:
if not self._read_eof_chunk:
self._read_eof_chunk = True
return (b"", False)

return (b"", True)

async def readexactly(self, n: int) -> bytes:
Expand Down
10 changes: 10 additions & 0 deletions tests/test_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,12 +1109,22 @@ async def test_empty_stream_reader() -> None:
assert await s.read() == b""
assert await s.readline() == b""
assert await s.readany() == b""
assert await s.readchunk() == (b"", False)
assert await s.readchunk() == (b"", True)
with pytest.raises(asyncio.IncompleteReadError):
await s.readexactly(10)
assert s.read_nowait() == b""


async def test_empty_stream_reader_iter_chunks() -> None:
s = streams.EmptyStreamReader()

# check that iter_chunks() does not cause infinite loop
iter_chunks = s.iter_chunks()
with pytest.raises(StopAsyncIteration):
await iter_chunks.__anext__()


@pytest.fixture
async def buffer(loop: Any):
return streams.DataQueue(loop)
Expand Down