diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-29 14:15:42 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-29 14:15:42 +0100 |
| commit | 6d14405fdb9357b689d76dcfd230018c0ce8c3a8 (patch) | |
| tree | c0e232c690588797b3a7da80561b22ab9c506192 /Lib/asyncio/tasks.py | |
| parent | 3e48d77bcba1eb5bf569ab7699f8b54775254d0a (diff) | |
| parent | 2934262fd36c35843c01b96657047625ce2e3cf6 (diff) | |
| download | cpython-git-6d14405fdb9357b689d76dcfd230018c0ce8c3a8.tar.gz | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/tasks.py')
| -rw-r--r-- | Lib/asyncio/tasks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 63412a97e6..4f19a252ff 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -592,7 +592,7 @@ def gather(*coros_or_futures, loop=None, return_exceptions=False): fut.exception() return - if fut._state == futures._CANCELLED: + if fut.cancelled(): res = futures.CancelledError() if not return_exceptions: outer.set_exception(res) |