diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-22 09:24:03 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-22 09:24:03 +0100 |
commit | 2fe68a363d4ebcb01826cb21338d78b691bcf244 (patch) | |
tree | 804fc9bcc1cb1ffe3ba0c3ade0c62df594097003 | |
parent | ae97759d878519f510d752865340c5a18f06ecc8 (diff) | |
download | trollius-git-2fe68a363d4ebcb01826cb21338d78b691bcf244.tar.gz |
IocpProactor.close(): don't cancel futures which are already cancelled
-rw-r--r-- | asyncio/windows_events.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/asyncio/windows_events.py b/asyncio/windows_events.py index 3cb5690..315455a 100644 --- a/asyncio/windows_events.py +++ b/asyncio/windows_events.py @@ -693,12 +693,16 @@ class IocpProactor: # queues a task to Windows' thread pool. This cannot # be cancelled, so just forget it. del self._cache[address] - # FIXME: Tulip issue 196: remove this case, it should not happen - elif fut.done() and not fut.cancelled(): - del self._cache[address] + elif fut.cancelled(): + # Nothing to do with cancelled futures + pass elif isinstance(fut, _WaitCancelFuture): # _WaitCancelFuture must not be cancelled pass + elif fut.done(): + # FIXME: Tulip issue 196: remove this case, it should not + # happen + del self._cache[address] else: try: fut.cancel() |