diff options
| author | Yury Selivanov <yury@magic.io> | 2016-09-15 17:49:08 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-09-15 17:49:08 (GMT) |
| commit | 4357cf62028964eb1a56c503ec1296de3034b77b (patch) | |
| tree | df72b686e2038e28047ceca7b462263a02d8f4dc /Lib/asyncio | |
| parent | f6d991d88502ee05da7c41217331ff024c634cbc (diff) | |
| download | cpython-4357cf62028964eb1a56c503ec1296de3034b77b.zip cpython-4357cf62028964eb1a56c503ec1296de3034b77b.tar.gz cpython-4357cf62028964eb1a56c503ec1296de3034b77b.tar.bz2 | |
Another asyncio sync.
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/base_events.py | 9 | ||||
| -rw-r--r-- | Lib/asyncio/tasks.py | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 619fe3a..bc3e012 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -13,7 +13,6 @@ conscious design decision, leaving the door open for keyword arguments to modify the meaning of the API call itself. """ - import collections import concurrent.futures import heapq @@ -1128,7 +1127,7 @@ class BaseEventLoop(events.AbstractEventLoop): transport = yield from self._make_subprocess_transport( protocol, cmd, True, stdin, stdout, stderr, bufsize, **kwargs) if self._debug: - logger.info('%s: %r' % (debug_log, transport)) + logger.info('%s: %r', debug_log, transport) return transport, protocol @coroutine @@ -1158,7 +1157,7 @@ class BaseEventLoop(events.AbstractEventLoop): protocol, popen_args, False, stdin, stdout, stderr, bufsize, **kwargs) if self._debug: - logger.info('%s: %r' % (debug_log, transport)) + logger.info('%s: %r', debug_log, transport) return transport, protocol def get_exception_handler(self): @@ -1238,7 +1237,9 @@ class BaseEventLoop(events.AbstractEventLoop): - 'handle' (optional): Handle instance; - 'protocol' (optional): Protocol instance; - 'transport' (optional): Transport instance; - - 'socket' (optional): Socket instance. + - 'socket' (optional): Socket instance; + - 'asyncgen' (optional): Asynchronous generator that caused + the exception. New keys maybe introduced in the future. diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 35c945c..4c66546 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -519,7 +519,7 @@ def sleep(delay, result=None, *, loop=None): h.cancel() -def async(coro_or_future, *, loop=None): +def async_(coro_or_future, *, loop=None): """Wrap a coroutine in a future. If the argument is a Future, it is returned directly. @@ -532,6 +532,11 @@ def async(coro_or_future, *, loop=None): return ensure_future(coro_or_future, loop=loop) +# Silence DeprecationWarning: +globals()['async'] = async_ +async_.__name__ = 'async' +del async_ + def ensure_future(coro_or_future, *, loop=None): """Wrap a coroutine or an awaitable in a future. |