(original) (raw)

changeset: 96410:b7b73029c825 branch: 3.4 parent: 96390:943fa0e8b6a4 user: Yury Selivanov yselivanov@sprymix.com date: Sat May 30 21:02:12 2015 -0400 files: Lib/asyncio/coroutines.py description: Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator diff -r 943fa0e8b6a4 -r b7b73029c825 Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py Sat May 30 13:53:49 2015 -0400 +++ b/Lib/asyncio/coroutines.py Sat May 30 21:02:12 2015 -0400 @@ -54,9 +54,10 @@ inspect.CO_COROUTINE) try: - from collections.abc import Coroutine as CoroutineABC + from collections.abc import Coroutine as CoroutineABC, \ + Awaitable as AwaitableABC except ImportError: - CoroutineABC = None + CoroutineABC = AwaitableABC = None # Check for CPython issue #21209 @@ -192,6 +193,16 @@ res = func(*args, **kw) if isinstance(res, futures.Future) or inspect.isgenerator(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 if not _DEBUG: /yselivanov@sprymix.com