diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-02-10 13:49:56 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-02-10 13:49:56 (GMT) |
| commit | 4163cc0d9f2d10531af9b70e25b8c94009e94509 (patch) | |
| tree | bfbd1eb038fc9efea809994b8e448ce0a2a811db /Lib/asyncio | |
| parent | 4bdcfce5129fbf2d710046b4d3f9be636e9e0898 (diff) | |
| parent | 8e36812e27f70bd6e4b3b85c9e9e858b0ac0df5e (diff) | |
| download | cpython-4163cc0d9f2d10531af9b70e25b8c94009e94509.zip cpython-4163cc0d9f2d10531af9b70e25b8c94009e94509.tar.gz cpython-4163cc0d9f2d10531af9b70e25b8c94009e94509.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/base_subprocess.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py index 02b9e89..5458ab1 100644 --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -93,7 +93,12 @@ class BaseSubprocessTransport(transports.SubprocessTransport): continue proto.pipe.close() - if self._proc is not None and self._returncode is None: + if (self._proc is not None + # the child process finished? + and self._returncode is None + # the child process finished but the transport was not notified yet? + and self._proc.poll() is None + ): if self._loop.get_debug(): logger.warning('Close running child process: kill %r', self) |