asyncion, Tulip issue 181: BaseEventLoop.create_datagram_endpoint() now waits
until protocol.connection_made() has been called. Document also why transport
constructors use a waiter.
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 52c5517..833f81d 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -169,7 +169,7 @@
raise NotImplementedError
def _make_datagram_transport(self, sock, protocol,
- address=None, extra=None):
+ address=None, waiter=None, extra=None):
"""Create datagram transport."""
raise NotImplementedError
@@ -605,7 +605,10 @@
raise exceptions[0]
protocol = protocol_factory()
- transport = self._make_datagram_transport(sock, protocol, r_addr)
+ waiter = futures.Future(loop=self)
+ transport = self._make_datagram_transport(sock, protocol, r_addr,
+ waiter)
+ yield from waiter
return transport, protocol
@coroutine
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index a80876f..fa24795 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -38,6 +38,7 @@
self._server.attach(self)
self._loop.call_soon(self._protocol.connection_made, self)
if waiter is not None:
+ # wait until protocol.connection_made() has been called
self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def _set_extra(self, sock):
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 2a17034..7b364ad 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -51,8 +51,9 @@
server_side, server_hostname, extra, server)
def _make_datagram_transport(self, sock, protocol,
- address=None, extra=None):
- return _SelectorDatagramTransport(self, sock, protocol, address, extra)
+ address=None, waiter=None, extra=None):
+ return _SelectorDatagramTransport(self, sock, protocol,
+ address, waiter, extra)
def close(self):
if self.is_closed():
@@ -481,6 +482,7 @@
self._loop.add_reader(self._sock_fd, self._read_ready)
self._loop.call_soon(self._protocol.connection_made, self)
if waiter is not None:
+ # wait until protocol.connection_made() has been called
self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def pause_reading(self):
@@ -690,6 +692,7 @@
self._loop.add_reader(self._sock_fd, self._read_ready)
self._loop.call_soon(self._protocol.connection_made, self)
if self._waiter is not None:
+ # wait until protocol.connection_made() has been called
self._loop.call_soon(self._waiter._set_result_unless_cancelled,
None)
@@ -806,11 +809,15 @@
_buffer_factory = collections.deque
- def __init__(self, loop, sock, protocol, address=None, extra=None):
+ def __init__(self, loop, sock, protocol, address=None,
+ waiter=None, extra=None):
super().__init__(loop, sock, protocol, extra)
self._address = address
self._loop.add_reader(self._sock_fd, self._read_ready)
self._loop.call_soon(self._protocol.connection_made, self)
+ if waiter is not None:
+ # wait until protocol.connection_made() has been called
+ self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def get_write_buffer_size(self):
return sum(len(data) for data, _ in self._buffer)
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 535ea22..764e719 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -269,6 +269,7 @@
self._loop.add_reader(self._fileno, self._read_ready)
self._loop.call_soon(self._protocol.connection_made, self)
if waiter is not None:
+ # wait until protocol.connection_made() has been called
self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def _read_ready(self):
@@ -353,6 +354,7 @@
self._loop.call_soon(self._protocol.connection_made, self)
if waiter is not None:
+ # wait until protocol.connection_made() has been called
self._loop.call_soon(waiter._set_result_unless_cancelled, None)
def get_write_buffer_size(self):