[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

Mon Jan 26 22:32:34 CET 2015

https://hg.python.org/cpython/rev/c16c2c409776
changeset: 94325:c16c2c409776
parent: 94322:db7ec64aac39
parent: 94324:9532923cbf2b
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Jan 26 22:31:03 2015 +0100
summary:
 Merge 3.4 (asyncio)
files:
 Lib/asyncio/windows_events.py | 57 ++++++++++++----------
 Modules/overlapped.c | 4 +-
 2 files changed, 32 insertions(+), 29 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
@@ -126,14 +126,12 @@
 return
 self._registered = False
 
+ wait_handle = self._wait_handle
+ self._wait_handle = None
 try:
- _overlapped.UnregisterWait(self._wait_handle)
+ _overlapped.UnregisterWait(wait_handle)
 except OSError as exc:
- self._wait_handle = None
- if exc.winerror == _overlapped.ERROR_IO_PENDING:
- # ERROR_IO_PENDING is not an error, the wait was unregistered
- self._unregister_wait_cb(None)
- elif exc.winerror != _overlapped.ERROR_IO_PENDING:
+ if exc.winerror != _overlapped.ERROR_IO_PENDING:
 context = {
 'message': 'Failed to unregister the wait handle',
 'exception': exc,
@@ -142,9 +140,10 @@
 if self._source_traceback:
 context['source_traceback'] = self._source_traceback
 self._loop.call_exception_handler(context)
- else:
- self._wait_handle = None
- self._unregister_wait_cb(None)
+ return
+ # ERROR_IO_PENDING means that the unregister is pending
+
+ self._unregister_wait_cb(None)
 
 def cancel(self):
 self._unregister_wait()
@@ -209,14 +208,12 @@
 return
 self._registered = False
 
+ wait_handle = self._wait_handle
+ self._wait_handle = None
 try:
- _overlapped.UnregisterWaitEx(self._wait_handle, self._event)
+ _overlapped.UnregisterWaitEx(wait_handle, self._event)
 except OSError as exc:
- self._wait_handle = None
- if exc.winerror == _overlapped.ERROR_IO_PENDING:
- # ERROR_IO_PENDING is not an error, the wait was unregistered
- self._unregister_wait_cb(None)
- elif exc.winerror != _overlapped.ERROR_IO_PENDING:
+ if exc.winerror != _overlapped.ERROR_IO_PENDING:
 context = {
 'message': 'Failed to unregister the wait handle',
 'exception': exc,
@@ -225,11 +222,11 @@
 if self._source_traceback:
 context['source_traceback'] = self._source_traceback
 self._loop.call_exception_handler(context)
- else:
- self._wait_handle = None
- self._event_fut = self._proactor._wait_cancel(
- self._event,
- self._unregister_wait_cb)
+ return
+ # ERROR_IO_PENDING is not an error, the wait was unregistered
+
+ self._event_fut = self._proactor._wait_cancel(self._event,
+ self._unregister_wait_cb)
 
 
 class PipeServer(object):
@@ -409,13 +406,21 @@
 self._results = []
 return tmp
 
+ def _result(self, value):
+ fut = futures.Future(loop=self._loop)
+ fut.set_result(value)
+ return fut
+
 def recv(self, conn, nbytes, flags=0):
 self._register_with_iocp(conn)
 ov = _overlapped.Overlapped(NULL)
- if isinstance(conn, socket.socket):
- ov.WSARecv(conn.fileno(), nbytes, flags)
- else:
- ov.ReadFile(conn.fileno(), nbytes)
+ try:
+ if isinstance(conn, socket.socket):
+ ov.WSARecv(conn.fileno(), nbytes, flags)
+ else:
+ ov.ReadFile(conn.fileno(), nbytes)
+ except BrokenPipeError:
+ return self._result(b'')
 
 def finish_recv(trans, key, ov):
 try:
@@ -508,9 +513,7 @@
 # ConnectNamePipe() failed with ERROR_PIPE_CONNECTED which means
 # that the pipe is connected. There is no need to wait for the
 # completion of the connection.
- f = futures.Future(loop=self._loop)
- f.set_result(pipe)
- return f
+ return self._result(pipe)
 
 def finish_accept_pipe(trans, key, ov):
 ov.getresult()
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -730,7 +730,7 @@
 switch (err) {
 case ERROR_BROKEN_PIPE:
 mark_as_completed(&self->overlapped);
- Py_RETURN_NONE;
+ return SetFromWindowsErr(err);
 case ERROR_SUCCESS:
 case ERROR_MORE_DATA:
 case ERROR_IO_PENDING:
@@ -789,7 +789,7 @@
 switch (err) {
 case ERROR_BROKEN_PIPE:
 mark_as_completed(&self->overlapped);
- Py_RETURN_NONE;
+ return SetFromWindowsErr(err);
 case ERROR_SUCCESS:
 case ERROR_MORE_DATA:
 case ERROR_IO_PENDING:
-- 
Repository URL: https://hg.python.org/cpython
