Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-29704: Fix asyncio.SubprocessStreamProtocol closing #405

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 5 commits into from
Mar 3, 2017
Merged

bpo-29704: Fix asyncio.SubprocessStreamProtocol closing #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acd47e2
Add changes to subprocess.py from python/asycio #485
SethMichaelLarson Mar 2, 2017
d6c6567
Add test_read_sdout_after_process_exit from python/asyncio#485
SethMichaelLarson Mar 2, 2017
0372b36
Remove fd from _maybe_close_transport call
SethMichaelLarson Mar 2, 2017
d7f619b
Add NEWS entry for bpo-29704
SethMichaelLarson Mar 2, 2017
90e84ea
Merge branch 'master' into patch-1
1st1 Mar 3, 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
17 changes: 15 additions & 2 deletions Lib/asyncio/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ def __init__(self, limit, loop):
self._limit = limit
self.stdin = self.stdout = self.stderr = None
self._transport = None
self._process_exited = False
self._pipe_fds = []

def __repr__(self):
info = [self.__class__.__name__]
Expand All @@ -43,12 +45,14 @@ def connection_made(self, transport):
self.stdout = streams.StreamReader(limit=self._limit,
loop=self._loop)
self.stdout.set_transport(stdout_transport)
self._pipe_fds.append(1)

stderr_transport = transport.get_pipe_transport(2)
if stderr_transport is not None:
self.stderr = streams.StreamReader(limit=self._limit,
loop=self._loop)
self.stderr.set_transport(stderr_transport)
self._pipe_fds.append(2)

stdin_transport = transport.get_pipe_transport(0)
if stdin_transport is not None:
Expand Down Expand Up @@ -85,10 +89,19 @@ def pipe_connection_lost(self, fd, exc):
reader.feed_eof()
else:
reader.set_exception(exc)

if fd in self._pipe_fds:
self._pipe_fds.remove(fd)
self._maybe_close_transport()

def process_exited(self):
self._transport.close()
self._transport = None
self._process_exited = True
self._maybe_close_transport()

def _maybe_close_transport(self):
if len(self._pipe_fds) == 0 and self._process_exited:
self._transport.close()
self._transport = None


class Process:
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_asyncio/test_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,28 @@ def test_popen_error(self):
self.loop.run_until_complete(create)
self.assertEqual(warns, [])

def test_read_stdout_after_process_exit(self):
@asyncio.coroutine
def execute():
code = '\n'.join(['import sys',
'for _ in range(64):',
' sys.stdout.write("x" * 4096)',
'sys.stdout.flush()',
'sys.exit(1)'])

fut = asyncio.create_subprocess_exec(sys.executable, '-c', code,
stdout=asyncio.subprocess.PIPE,
loop=self.loop)
process = yield from fut
while True:
data = yield from process.stdout.read(65536)
if data:
yield from asyncio.sleep(0.3, loop=self.loop)
else:
break

self.loop.run_until_complete(execute())


if sys.platform != 'win32':
# Unix
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ Extension Modules
Library
-------

- bpo-29704: asyncio.subprocess.SubprocessStreamProtocol no longer closes before
all pipes are closed.

- bpo-29271: Fix Task.current_task and Task.all_tasks implemented in C
to accept None argument as their pure Python implementation.

Expand Down