[Python-checkins] cpython: asyncio/windows_events.py: use more revelant names to overlapped callbacks

[victor.stinner]

http://hg.python.org/cpython/rev/f686cf9be887
changeset:   89400:f686cf9be887
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Feb 26 17:35:30 2014 +0100
summary:
  asyncio/windows_events.py: use more revelant names to overlapped callbacks

For example: "finish_recv", not just "finish".

files:
  Lib/asyncio/selector_events.py |   3 +--
  Lib/asyncio/windows_events.py  |  20 ++++++++++----------
  2 files changed, 11 insertions(+), 12 deletions(-)


diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -702,8 +702,7 @@
         if self._buffer:
             try:
                 n = self._sock.send(self._buffer)
-            except (BlockingIOError, InterruptedError,
-                    ssl.SSLWantWriteError):
+            except (BlockingIOError, InterruptedError, ssl.SSLWantWriteError):
                 n = 0
             except ssl.SSLWantReadError:
                 n = 0
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
@@ -213,7 +213,7 @@
         else:
             ov.ReadFile(conn.fileno(), nbytes)
 
-        def finish(trans, key, ov):
+        def finish_recv(trans, key, ov):
             try:
                 return ov.getresult()
             except OSError as exc:
@@ -222,7 +222,7 @@
                 else:
                     raise
 
-        return self._register(ov, conn, finish)
+        return self._register(ov, conn, finish_recv)
 
     def send(self, conn, buf, flags=0):
         self._register_with_iocp(conn)
@@ -232,7 +232,7 @@
         else:
             ov.WriteFile(conn.fileno(), buf)
 
-        def finish(trans, key, ov):
+        def finish_send(trans, key, ov):
             try:
                 return ov.getresult()
             except OSError as exc:
@@ -241,7 +241,7 @@
                 else:
                     raise
 
-        return self._register(ov, conn, finish)
+        return self._register(ov, conn, finish_send)
 
     def accept(self, listener):
         self._register_with_iocp(listener)
@@ -300,17 +300,17 @@
         ov = _overlapped.Overlapped(NULL)
         ov.ConnectNamedPipe(pipe.fileno())
 
-        def finish(trans, key, ov):
+        def finish_accept_pipe(trans, key, ov):
             ov.getresult()
             return pipe
 
-        return self._register(ov, pipe, finish)
+        return self._register(ov, pipe, finish_accept_pipe)
 
     def connect_pipe(self, address):
         ov = _overlapped.Overlapped(NULL)
         ov.WaitNamedPipeAndConnect(address, self._iocp, ov.address)
 
-        def finish(err, handle, ov):
+        def finish_connect_pipe(err, handle, ov):
             # err, handle were arguments passed to PostQueuedCompletionStatus()
             # in a function run in a thread pool.
             if err == _overlapped.ERROR_SEM_TIMEOUT:
@@ -323,7 +323,7 @@
             else:
                 return windows_utils.PipeHandle(handle)
 
-        return self._register(ov, None, finish, wait_for_post=True)
+        return self._register(ov, None, finish_connect_pipe, wait_for_post=True)
 
     def wait_for_handle(self, handle, timeout=None):
         if timeout is None:
@@ -339,7 +339,7 @@
             handle, self._iocp, ov.address, ms)
         f = _WaitHandleFuture(wh, loop=self._loop)
 
-        def finish(trans, key, ov):
+        def finish_wait_for_handle(trans, key, ov):
             if not f.cancelled():
                 try:
                     _overlapped.UnregisterWait(wh)
@@ -355,7 +355,7 @@
             return (_winapi.WaitForSingleObject(handle, 0) ==
                     _winapi.WAIT_OBJECT_0)
 
-        self._cache[ov.address] = (f, ov, None, finish)
+        self._cache[ov.address] = (f, ov, None, finish_wait_for_handle)
         return f
 
     def _register_with_iocp(self, obj):

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