Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 (asyncio)

This commit is contained in:
Victor Stinner 2015-01-13 16:13:36 +01:00
parent 610bc6a211 9036e49ba1
commit 7d5a95627b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/asyncio/proactor_events.py
View File

@ -387,13 +387,19 @@ class BaseProactorEventLoop(base_events.BaseEventLoop):
raise RuntimeError("Cannot close a running event loop") raise RuntimeError("Cannot close a running event loop")
if self.is_closed(): if self.is_closed():
return return
# Call these methods before closing the event loop (before calling
# BaseEventLoop.close), because they can schedule callbacks with
# call_soon(), which is forbidden when the event loop is closed.
self._stop_accept_futures() self._stop_accept_futures()
self._close_self_pipe() self._close_self_pipe()
super().close()
self._proactor.close() self._proactor.close()
self._proactor = None self._proactor = None
self._selector = None self._selector = None
# Close the event loop
super().close()
def sock_recv(self, sock, n): def sock_recv(self, sock, n):
return self._proactor.recv(sock, n) return self._proactor.recv(sock, n)

3
Lib/test/test_asyncio/test_windows_events.py
View File

@ -67,7 +67,8 @@ class ProactorTests(test_utils.TestCase):
clients = [] clients = []
for i in range(5): for i in range(5):
stream_reader = asyncio.StreamReader(loop=self.loop) stream_reader = asyncio.StreamReader(loop=self.loop)
protocol = asyncio.StreamReaderProtocol(stream_reader) protocol = asyncio.StreamReaderProtocol(stream_reader,
loop=self.loop)
trans, proto = yield from self.loop.create_pipe_connection( trans, proto = yield from self.loop.create_pipe_connection(
lambda: protocol, ADDRESS) lambda: protocol, ADDRESS)
self.assertIsInstance(trans, asyncio.Transport) self.assertIsInstance(trans, asyncio.Transport)