diff options
| author | Yury Selivanov <yury@magic.io> | 2016-10-28 16:53:29 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-10-28 16:53:29 (GMT) |
| commit | 29d3cbfe9786697960fb4ccf79276cf44158e7e7 (patch) | |
| tree | acf5eb4006e74c60f47fea7ec628ed4d5db576a2 /Lib/asyncio/coroutines.py | |
| parent | 01dfb6c72d09c3f2a905c720f820d19a52cbbb62 (diff) | |
| parent | a0c1ba608eb89b4e10155f7652c50a3ac0b709af (diff) | |
| download | cpython-29d3cbfe9786697960fb4ccf79276cf44158e7e7.zip cpython-29d3cbfe9786697960fb4ccf79276cf44158e7e7.tar.gz cpython-29d3cbfe9786697960fb4ccf79276cf44158e7e7.tar.bz2 | |
Merge 3.6 (issue #28544)
Diffstat (limited to 'Lib/asyncio/coroutines.py')
| -rw-r--r-- | Lib/asyncio/coroutines.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py index 1db7030..167c1e4 100644 --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -11,7 +11,7 @@ import types from . import compat from . import events -from . import futures +from . import base_futures from .log import logger @@ -204,7 +204,7 @@ def coroutine(func): @functools.wraps(func) def coro(*args, **kw): res = func(*args, **kw) - if (futures.isfuture(res) or inspect.isgenerator(res) or + if (base_futures.isfuture(res) or inspect.isgenerator(res) or isinstance(res, CoroWrapper)): res = yield from res elif _AwaitableABC is not None: |