bpo-29704: Fix asyncio.SubprocessStreamProtocol closing (#405)
diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py
index b2f5304..06c7d4f 100644
--- a/Lib/asyncio/subprocess.py
+++ b/Lib/asyncio/subprocess.py
@@ -24,6 +24,8 @@
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__]
@@ -43,12 +45,14 @@
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:
@@ -85,10 +89,19 @@
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:
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index bba688b..407e8b6 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -459,6 +459,28 @@
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
diff --git a/Misc/NEWS b/Misc/NEWS
index 12f57f9..3c59c75 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -259,6 +259,9 @@
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.