Skip to content

bpo-38242: Revert new asyncio streaming API #16455

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
aeros wants to merge 22 commits into from
Closed

bpo-38242: Revert new asyncio streaming API #16455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ddbd854
Revert "bpo-36889: Merge asyncio streams (GH-13251)"
aeros Sep 28, 2019
4fb43ff
Revert "bpo-37105: Add deprecated-remove information on stream doc (#…
aeros Sep 28, 2019
cd886e3
Revert "bpo-36889: Document asyncio Stream and StreamServer (GH-14203)"
aeros Sep 28, 2019
aaf003d
Revert "bpo-36889: Document Stream class and add docstrings (GH-14488)"
aeros Sep 28, 2019
f390d31
Fix broken method names
aeros Sep 28, 2019
5e2e75a
Remove explicit passing of loop arg
aeros Sep 28, 2019
557974e
Replace asyncio.Task with create_task
aeros Sep 28, 2019
917b47a
Fix create_task
aeros Sep 28, 2019
01ce34b
Replace asyncio.Task with loop.create_task in test_streams
aeros Sep 28, 2019
db3a53a
Merge branch 'revert-asyncio-streaming' of https://github.com/aeros16…
aeros Sep 28, 2019
2d0324b
Patchcheck and fix missing paren
aeros Sep 28, 2019
110c65b
Restore deprecation warnings for explicit loop arg
aeros Sep 28, 2019
dc7e868
Restore deprecation warnings in test_streams
aeros Sep 28, 2019
e1c42ce
Restore test__all__
aeros Sep 28, 2019
9b733e1
Restore test_sslproto
aeros Sep 28, 2019
4abc7fe
Restore test_base_events
aeros Sep 28, 2019
226187e
Restore test_server
aeros Sep 28, 2019
20406d3
Remove _asyncio_internal from StreamReader and StreamReaderProtocol
aeros Sep 28, 2019
bc82fd3
Remove unneeded _asyncio_internal in test_subprocess
aeros Sep 28, 2019
2d02e8a
Remove _asyncio_internal from Process
aeros Sep 28, 2019
e49359c
Remove DeprecationWarning tests from new API
aeros Sep 28, 2019
ec1c0b7
Fix test name
aeros Sep 29, 2019
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
Prev Previous commit
Next Next commit
Fix broken method names
  • Loading branch information
@aeros
aeros committed Sep 28, 2019
commit f390d31f894f139a4deb3a93c50f666a599c1a30
6 changes: 3 additions & 3 deletions Lib/asyncio/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def pipe_data_received(self, fd, data):
else:
reader = None
if reader is not None:
reader._feed_data(data)
reader.feed_data(data)

def pipe_connection_lost(self, fd, exc):
if fd == 0:
Expand All @@ -94,9 +94,9 @@ def pipe_connection_lost(self, fd, exc):
reader = None
if reader is not None:
if exc is None:
reader._feed_eof()
reader.feed_eof()
else:
reader._set_exception(exc)
reader.set_exception(exc)

if fd in self._pipe_fds:
self._pipe_fds.remove(fd)
Expand Down
101 changes: 51 additions & 50 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 @@ -138,14 +138,14 @@ def test_feed_empty_data(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)

stream._feed_data(b'')
stream.feed_data(b'')
self.assertEqual(b'', stream._buffer)

def test_feed_nonempty_data(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)

stream._feed_data(self.DATA)
stream.feed_data(self.DATA)
self.assertEqual(self.DATA, stream._buffer)

def test_read_zero(self):
Expand All @@ -165,7 +165,7 @@ def test_read(self):
read_task = asyncio.Task(stream.read(30), loop=self.loop)

def cb():
stream._feed_data(self.DATA)
stream.feed_data(self.DATA)
self.loop.call_soon(cb)

data = self.loop.run_until_complete(read_task)
Expand All @@ -191,7 +191,7 @@ def test_read_eof(self):
read_task = asyncio.Task(stream.read(1024), loop=self.loop)

def cb():
stream._feed_eof()
stream.feed_eof()
self.loop.call_soon(cb)

data = self.loop.run_until_complete(read_task)
Expand All @@ -205,9 +205,9 @@ def test_read_until_eof(self):
read_task = asyncio.Task(stream.read(-1), loop=self.loop)

def cb():
stream._feed_data(b'chunk1\n')
stream._feed_data(b'chunk2')
stream._feed_eof()
stream.feed_data(b'chunk1\n')
stream.feed_data(b'chunk2')
stream.feed_eof()
self.loop.call_soon(cb)

data = self.loop.run_until_complete(read_task)
Expand All @@ -223,7 +223,7 @@ def test_read_exception(self):
data = self.loop.run_until_complete(stream.read(2))
self.assertEqual(b'li', data)

stream._set_exception(ValueError())
stream.set_exception(ValueError())
self.assertRaises(
ValueError, self.loop.run_until_complete, stream.read(2))

Expand Down Expand Up @@ -253,9 +253,9 @@ def test_readline(self):
read_task = asyncio.Task(stream.readline(), loop=self.loop)

def cb():
stream._feed_data(b'chunk2 ')
stream._feed_data(b'chunk3 ')
stream._feed_data(b'\n chunk4')
stream.feed_data(b'chunk2 ')
stream.feed_data(b'chunk3 ')
stream.feed_data(b'\n chunk4')
self.loop.call_soon(cb)

line = self.loop.run_until_complete(read_task)
Expand Down Expand Up @@ -296,14 +296,14 @@ def test_at_eof(self):
_asyncio_internal=True)
self.assertFalse(stream.at_eof())

stream._feed_data(b'some data\n')
stream.feed_data(b'some data\n')
self.assertFalse(stream.at_eof())

self.loop.run_until_complete(stream.readline())
self.assertFalse(stream.at_eof())

stream._feed_data(b'some data\n')
stream._feed_eof()
stream.feed_data(b'some data\n')
stream.feed_eof()
self.loop.run_until_complete(stream.readline())
self.assertTrue(stream.at_eof())

Expand All @@ -314,10 +314,10 @@ def test_readline_limit(self):
stream = asyncio.StreamReader(limit=7, loop=self.loop,
_asyncio_internal=True)
def cb():
stream._feed_data(b'chunk1')
stream._feed_data(b'chunk2')
stream._feed_data(b'chunk3\n')
stream._feed_eof()
stream.feed_data(b'chunk1')
stream.feed_data(b'chunk2')
stream.feed_data(b'chunk3\n')
stream.feed_eof()
self.loop.call_soon(cb)

self.assertRaises(
Expand All @@ -329,10 +329,10 @@ def cb():
stream = asyncio.StreamReader(limit=7, loop=self.loop,
_asyncio_internal=True)
def cb():
stream._feed_data(b'chunk1')
stream._feed_data(b'chunk2\n')
stream._feed_data(b'chunk3\n')
stream._feed_eof()
stream.feed_data(b'chunk1')
stream.feed_data(b'chunk2\n')
stream.feed_data(b'chunk3\n')
stream.feed_eof()
self.loop.call_soon(cb)

self.assertRaises(
Expand All @@ -343,15 +343,16 @@ def cb():
stream = asyncio.StreamReader(limit=7, loop=self.loop,
_asyncio_internal=True)
stream.feed_data(b'1234567\n')
line = self.loop.run_until_complete(stream.readline())
self.assertEqual(b'1234567\n', line)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'12345678\n')
stream.feed_data(b'12345678\n')
with self.assertRaises(ValueError) as cm:
self.loop.run_until_complete(stream.readline())
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'12345678')
stream.feed_data(b'12345678')
with self.assertRaises(ValueError) as cm:
self.loop.run_until_complete(stream.readline())
self.assertEqual(b'', stream._buffer)
Expand Down Expand Up @@ -406,7 +407,7 @@ def test_readline_exception(self):
data = self.loop.run_until_complete(stream.readline())
self.assertEqual(b'line\n', data)

stream._set_exception(ValueError())
stream.set_exception(ValueError())
self.assertRaises(
ValueError, self.loop.run_until_complete, stream.readline())
self.assertEqual(b'', stream._buffer)
Expand All @@ -421,17 +422,17 @@ def test_readuntil_multi_chunks(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)

stream._feed_data(b'lineAAA')
stream.feed_data(b'lineAAA')
data = self.loop.run_until_complete(stream.readuntil(separator=b'AAA'))
self.assertEqual(b'lineAAA', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'lineAAA')
stream.feed_data(b'lineAAA')
data = self.loop.run_until_complete(stream.readuntil(b'AAA'))
self.assertEqual(b'lineAAA', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'lineAAAxxx')
stream.feed_data(b'lineAAAxxx')
data = self.loop.run_until_complete(stream.readuntil(b'AAA'))
self.assertEqual(b'lineAAA', data)
self.assertEqual(b'xxx', stream._buffer)
Expand All @@ -440,34 +441,34 @@ def test_readuntil_multi_chunks_1(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)

stream._feed_data(b'QWEaa')
stream._feed_data(b'XYaa')
stream._feed_data(b'a')
stream.feed_data(b'QWEaa')
stream.feed_data(b'XYaa')
stream.feed_data(b'a')
data = self.loop.run_until_complete(stream.readuntil(b'aaa'))
self.assertEqual(b'QWEaaXYaaa', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'QWEaa')
stream._feed_data(b'XYa')
stream._feed_data(b'aa')
stream.feed_data(b'QWEaa')
stream.feed_data(b'XYa')
stream.feed_data(b'aa')
data = self.loop.run_until_complete(stream.readuntil(b'aaa'))
self.assertEqual(b'QWEaaXYaaa', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'aaa')
stream.feed_data(b'aaa')
data = self.loop.run_until_complete(stream.readuntil(b'aaa'))
self.assertEqual(b'aaa', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'Xaaa')
stream.feed_data(b'Xaaa')
data = self.loop.run_until_complete(stream.readuntil(b'aaa'))
self.assertEqual(b'Xaaa', data)
self.assertEqual(b'', stream._buffer)

stream._feed_data(b'XXX')
stream._feed_data(b'a')
stream._feed_data(b'a')
stream._feed_data(b'a')
stream.feed_data(b'XXX')
stream.feed_data(b'a')
stream.feed_data(b'a')
stream.feed_data(b'a')
data = self.loop.run_until_complete(stream.readuntil(b'aaa'))
self.assertEqual(b'XXXaaa', data)
self.assertEqual(b'', stream._buffer)
Expand All @@ -494,7 +495,7 @@ def test_readuntil_limit_found_sep(self):

self.assertEqual(b'some dataAA', stream._buffer)

stream._feed_data(b'A')
stream.feed_data(b'A')
with self.assertRaisesRegex(asyncio.LimitOverrunError,
'is found') as cm:
self.loop.run_until_complete(stream.readuntil(b'AAA'))
Expand Down Expand Up @@ -524,9 +525,9 @@ def test_readexactly(self):
read_task = self.loop.create_task(stream.readexactly(n))

def cb():
stream._feed_data(self.DATA)
stream._feed_data(self.DATA)
stream._feed_data(self.DATA)
stream.feed_data(self.DATA)
stream.feed_data(self.DATA)
stream.feed_data(self.DATA)
self.loop.call_soon(cb)

data = self.loop.run_until_complete(read_task)
Expand All @@ -549,8 +550,8 @@ def test_readexactly_eof(self):
read_task = self.loop.create_task(stream.readexactly(n))

def cb():
stream._feed_data(self.DATA)
stream._feed_eof()
stream.feed_data(self.DATA)
stream.feed_eof()
self.loop.call_soon(cb)

with self.assertRaises(asyncio.IncompleteReadError) as cm:
Expand All @@ -569,7 +570,7 @@ def test_readexactly_exception(self):
data = self.loop.run_until_complete(stream.readexactly(2))
self.assertEqual(b'li', data)

stream._set_exception(ValueError())
stream.set_exception(ValueError())
self.assertRaises(
ValueError, self.loop.run_until_complete, stream.readexactly(2))

Expand All @@ -579,15 +580,15 @@ def test_exception(self):
self.assertIsNone(stream.exception())

exc = ValueError()
stream._set_exception(exc)
stream.set_exception(exc)
self.assertIs(stream.exception(), exc)

def test_exception_waiter(self):
stream = asyncio.StreamReader(loop=self.loop,
_asyncio_internal=True)

async def set_err():
stream._set_exception(ValueError())
stream.set_exception(ValueError())

t1 = self.loop.create_task(stream.readline())
t2 = self.loop.create_task(set_err())
Expand All @@ -605,7 +606,7 @@ def test_exception_cancel(self):
t.cancel()
test_utils.run_briefly(self.loop)
# The following line fails if set_exception() isn't careful.
stream._set_exception(RuntimeError('message'))
stream.set_exception(RuntimeError('message'))
test_utils.run_briefly(self.loop)
self.assertIs(stream._waiter, None)

Expand Down