summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-02-26 17:34:07 +0100
committerVictor Stinner <victor.stinner@gmail.com>2014-02-26 17:34:07 +0100
commitda79fc7e24f286cd57525d8d4b221930b9d221a5 (patch)
treee5fe964bd975113b4fa1007a892daea78138e9aa
parent0d4a3ac19173ee503a732fccc839f4113bc4062f (diff)
downloadtrollius-da79fc7e24f286cd57525d8d4b221930b9d221a5.tar.gz
windows_events.py: use more revelant names to overlapped callbacks
For example: "finish_recv", not just "finish".
-rw-r--r--asyncio/windows_events.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/asyncio/windows_events.py b/asyncio/windows_events.py
index 60fb589..19f2588 100644
--- a/asyncio/windows_events.py
+++ b/asyncio/windows_events.py
@@ -213,7 +213,7 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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 @@ class IocpProactor:
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):