mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge 3.5 (Issue #27041)

Browse source
This commit is contained in:
Yury Selivanov 2016-05-16 15:39:39 -04:00
commit 8ace2c66d3
14 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/asyncio/base_events.py
View file

@ -209,7 +209,7 @@ class Server(events.AbstractServer):
def wait_closed(self):
if self.sockets is None or self._waiters is None:
return
waiter = futures.Future(loop=self._loop)
waiter = self._loop.create_future()
self._waiters.append(waiter)
yield from waiter
@ -243,6 +243,10 @@ class BaseEventLoop(events.AbstractEventLoop):
% (self.__class__.__name__, self.is_running(),
self.is_closed(), self.get_debug()))
def create_future(self):
"""Create a Future object attached to the loop."""
return futures.Future(loop=self)
def create_task(self, coro):
"""Schedule a coroutine object.
@ -537,7 +541,7 @@ class BaseEventLoop(events.AbstractEventLoop):
assert not args
assert not isinstance(func, events.TimerHandle)
if func._cancelled:
f = futures.Future(loop=self)
f = self.create_future()
f.set_result(None)
return f
func, args = func._callback, func._args
@ -580,7 +584,7 @@ class BaseEventLoop(events.AbstractEventLoop):
family=0, type=0, proto=0, flags=0):
info = _ipaddr_info(host, port, family, type, proto)
if info is not None:
fut = futures.Future(loop=self)
fut = self.create_future()
fut.set_result([info])
return fut
elif self._debug:
@ -721,7 +725,7 @@ class BaseEventLoop(events.AbstractEventLoop):
def _create_connection_transport(self, sock, protocol_factory, ssl,
server_hostname):
protocol = protocol_factory()
waiter = futures.Future(loop=self)
waiter = self.create_future()
if ssl:
sslcontext = None if isinstance(ssl, bool) else ssl
transport = self._make_ssl_transport(
@ -841,7 +845,7 @@ class BaseEventLoop(events.AbstractEventLoop):
raise exceptions[0]
protocol = protocol_factory()
waiter = futures.Future(loop=self)
waiter = self.create_future()
transport = self._make_datagram_transport(
sock, protocol, r_addr, waiter)
if self._debug:
@ -980,7 +984,7 @@ class BaseEventLoop(events.AbstractEventLoop):
@coroutine
def connect_read_pipe(self, protocol_factory, pipe):
protocol = protocol_factory()
waiter = futures.Future(loop=self)
waiter = self.create_future()
transport = self._make_read_pipe_transport(pipe, protocol, waiter)
try:
@ -997,7 +1001,7 @@ class BaseEventLoop(events.AbstractEventLoop):
@coroutine
def connect_write_pipe(self, protocol_factory, pipe):
protocol = protocol_factory()
waiter = futures.Future(loop=self)
waiter = self.create_future()
transport = self._make_write_pipe_transport(pipe, protocol, waiter)
try: