[Python-checkins] cpython (3.4): Issue #23095, asyncio: IocpProactor.close() must not cancel pending

[victor.stinner]

https://hg.python.org/cpython/rev/d3804307cce4
changeset:   94234:d3804307cce4
branch:      3.4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Jan 22 00:17:54 2015 +0100
summary:
  Issue #23095, asyncio: IocpProactor.close() must not cancel pending
_WaitCancelFuture futures

files:
  Lib/asyncio/windows_events.py |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -163,6 +163,9 @@
 
         self._done_callback = None
 
+    def cancel(self):
+        raise RuntimeError("_WaitCancelFuture must not be cancelled")
+
     def _schedule_callbacks(self):
         super(_WaitCancelFuture, self)._schedule_callbacks()
         if self._done_callback is not None:
@@ -693,6 +696,9 @@
             # FIXME: Tulip issue 196: remove this case, it should not happen
             elif fut.done() and not fut.cancelled():
                 del self._cache[address]
+            elif isinstance(fut, _WaitCancelFuture):
+                # _WaitCancelFuture must not be cancelled
+                pass
             else:
                 try:
                     fut.cancel()

-- 
Repository URL: https://hg.python.org/cpython