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

Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator 

(Merge 3.4)
This commit is contained in:
Yury Selivanov 2015-05-30 21:02:34 -04:00
parent bf304fcb32 a316085192
commit 353f2299bf
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/asyncio/coroutines.py
View File

@ -54,9 +54,10 @@ else:
inspect.CO_COROUTINE) inspect.CO_COROUTINE)
try: try:
from collections.abc import Coroutine as CoroutineABC from collections.abc import Coroutine as CoroutineABC, \
Awaitable as AwaitableABC
except ImportError: except ImportError:
CoroutineABC = None CoroutineABC = AwaitableABC = None
# Check for CPython issue #21209 # Check for CPython issue #21209
@ -192,6 +193,16 @@ def coroutine(func):
res = func(*args, **kw) res = func(*args, **kw)
if isinstance(res, futures.Future) or inspect.isgenerator(res): if isinstance(res, futures.Future) or inspect.isgenerator(res):
res = yield from res res = yield from res
elif AwaitableABC is not None:
# If 'func' returns an Awaitable (new in 3.5) we
# want to run it.
try:
await_meth = res.__await__
except AttributeError:
pass
else:
if isinstance(res, AwaitableABC):
res = yield from await_meth()
return res return res
if not _DEBUG: if not _DEBUG: