bpo-34215: Clarify IncompleteReadError message when "expected" is None (GH-21925) (GH-23539)
Co-Authored-By: Tyler Bell <mrbell321@gmail.com>
(cherry picked from commit 8085f742f4
)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
This commit is contained in:
parent
761c5a1ce4
commit
df6c8bcffe
|
@ -34,8 +34,9 @@ class IncompleteReadError(EOFError):
|
||||||
- expected: total number of expected bytes (or None if unknown)
|
- expected: total number of expected bytes (or None if unknown)
|
||||||
"""
|
"""
|
||||||
def __init__(self, partial, expected):
|
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 '
|
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.partial = partial
|
||||||
self.expected = expected
|
self.expected = expected
|
||||||
|
|
||||||
|
|
|
@ -452,12 +452,14 @@ class StreamTests(test_utils.TestCase):
|
||||||
|
|
||||||
def test_readuntil_eof(self):
|
def test_readuntil_eof(self):
|
||||||
stream = asyncio.StreamReader(loop=self.loop)
|
stream = asyncio.StreamReader(loop=self.loop)
|
||||||
stream.feed_data(b'some dataAA')
|
data = b'some dataAA'
|
||||||
|
stream.feed_data(data)
|
||||||
stream.feed_eof()
|
stream.feed_eof()
|
||||||
|
|
||||||
with self.assertRaises(asyncio.IncompleteReadError) as cm:
|
with self.assertRaisesRegex(asyncio.IncompleteReadError,
|
||||||
|
'undefined expected bytes') as cm:
|
||||||
self.loop.run_until_complete(stream.readuntil(b'AAA'))
|
self.loop.run_until_complete(stream.readuntil(b'AAA'))
|
||||||
self.assertEqual(cm.exception.partial, b'some dataAA')
|
self.assertEqual(cm.exception.partial, data)
|
||||||
self.assertIsNone(cm.exception.expected)
|
self.assertIsNone(cm.exception.expected)
|
||||||
self.assertEqual(b'', stream._buffer)
|
self.assertEqual(b'', stream._buffer)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Clarify the error message for :exc:`asyncio.IncompleteReadError` when
|
||||||
|
``expected`` is ``None``.
|
Loading…
Reference in New Issue