diff options
| author | Yury Selivanov <yury@magic.io> | 2016-10-21 21:25:02 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-10-21 21:25:02 (GMT) |
| commit | 384ec37081de105b5490ee8992220f96092a2835 (patch) | |
| tree | 0c1ca40982b526b9d9261e3f11534d6d2191b047 /Lib/asyncio/tasks.py | |
| parent | f5cd8a29f39662ef0756027f73556639c54fceb2 (diff) | |
| parent | e145efcd7a6e72f3190ea0934a1101cd45ee3c08 (diff) | |
| download | cpython-384ec37081de105b5490ee8992220f96092a2835.zip cpython-384ec37081de105b5490ee8992220f96092a2835.tar.gz cpython-384ec37081de105b5490ee8992220f96092a2835.tar.bz2 | |
Merge 3.6 (issue #26923)
Diffstat (limited to 'Lib/asyncio/tasks.py')
| -rw-r--r-- | Lib/asyncio/tasks.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 14949d1..8852aa5 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -592,9 +592,11 @@ class _GatheringFuture(futures.Future): def cancel(self): if self.done(): return False + ret = False for child in self._children: - child.cancel() - return True + if child.cancel(): + ret = True + return ret def gather(*coros_or_futures, loop=None, return_exceptions=False): |