From 752aba7f999b08c833979464a36840de8be0baf0 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 22 Jan 2015 22:47:13 +0100 Subject: asyncio: IocpProactor.close() doesn't cancel anymore futures which are already cancelled --- Lib/asyncio/windows_events.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 3cb5690f..315455a 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/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() -- cgit v0.12