Skip to content

bpo-34215: Update streams.py:readuntil IncompleteReadError issue #4354

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

Closed
mrbell321 wants to merge 3 commits into from
Closed

bpo-34215: Update streams.py:readuntil IncompleteReadError issue #4354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aad5ddf
Fixing test_readuntil_eof
mrbell321 Nov 9, 2017
46920bc
Merge branch 'master' of https://github.com/python/cpython
May 17, 2019
d925335
Improved incompleteReadError text when expected is None, including test
mrbell321 Nov 9, 2017
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
3 changes: 2 additions & 1 deletion Lib/asyncio/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ class IncompleteReadError(EOFError):
- expected: total number of expected bytes (or None if unknown)
"""
def __init__(self, partial, expected):
r_expected = "undefined" if expected is None else repr(expected)
super().__init__(f'{len(partial)} bytes read on a total of '
f'{expected!r} expected bytes')
f'{r_expected} expected bytes')
self.partial = partial
self.expected = expected

Expand Down
8 changes: 5 additions & 3 deletions Lib/test/test_asyncio/test_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,14 @@ def test_readuntil_multi_chunks_1(self):
def test_readuntil_eof(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)
stream.feed_data(b'some dataAA')
data = b'some dataAA'
stream.feed_data(data)
stream.feed_eof()

separator = b'AAA'
with self.assertRaises(asyncio.IncompleteReadError) as cm:
self.loop.run_until_complete(stream.readuntil(b'AAA'))
self.assertEqual(cm.exception.partial, b'some dataAA')
self.loop.run_until_complete(stream.readuntil(separator))
self.assertEqual(cm.exception.partial, data)
self.assertIsNone(cm.exception.expected)
self.assertEqual(b'', stream._buffer)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-07-24-15-55-14.bpo-34215.A3SHwM.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
streams.py:IncompleteReadError message improvement when expected is None