[Python-checkins] cpython (3.4): Issue #23293, asyncio: Cleanup IocpProactor.close()

[victor.stinner]

https://hg.python.org/cpython/rev/b6ab8fe16d16
changeset:   94299:b6ab8fe16d16
branch:      3.4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Jan 26 11:02:59 2015 +0100
summary:
  Issue #23293, asyncio: Cleanup IocpProactor.close()

The special case for connect_pipe() is not more needed. connect_pipe() doesn't
use overlapped operations anymore.

files:
  Lib/asyncio/windows_events.py |  7 +------
  1 files changed, 1 insertions(+), 6 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
@@ -694,12 +694,7 @@
     def close(self):
         # Cancel remaining registered operations.
         for address, (fut, ov, obj, callback) in list(self._cache.items()):
-            if obj is None:
-                # The operation was started with connect_pipe() which
-                # queues a task to Windows' thread pool.  This cannot
-                # be cancelled, so just forget it.
-                del self._cache[address]
-            elif fut.cancelled():
+            if fut.cancelled():
                 # Nothing to do with cancelled futures
                 pass
             elif isinstance(fut, _WaitCancelFuture):

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