diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-06 00:14:09 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-06 00:14:09 (GMT) |
| commit | 43a85343649fda4d3f7b56d71bafd01ce88f0b99 (patch) | |
| tree | 57853282b538674cda1efa8a564409b001dcda1a /Lib/asyncio/subprocess.py | |
| parent | 2b014b37486bb92f1fd641b59f8b7fe8741e5351 (diff) | |
| parent | c447ba04e78a91c1febe7744b9e6cbcdd3e23360 (diff) | |
| download | cpython-43a85343649fda4d3f7b56d71bafd01ce88f0b99.zip cpython-43a85343649fda4d3f7b56d71bafd01ce88f0b99.tar.gz cpython-43a85343649fda4d3f7b56d71bafd01ce88f0b99.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/subprocess.py')
| -rw-r--r-- | Lib/asyncio/subprocess.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py index f6d6a14..a8ad03c 100644 --- a/Lib/asyncio/subprocess.py +++ b/Lib/asyncio/subprocess.py @@ -96,7 +96,8 @@ class SubprocessStreamProtocol(streams.FlowControlMixin, returncode = self._transport.get_returncode() while self._waiters: waiter = self._waiters.popleft() - waiter.set_result(returncode) + if not waiter.cancelled(): + waiter.set_result(returncode) class Process: |