Merge 3.5 (issue #28372)

This commit is contained in:
Yury Selivanov 2016-10-05 19:33:36 -04:00
commit 996dd4a666
3 changed files with 55 additions and 0 deletions

View file

@ -261,6 +261,25 @@ def iscoroutine(obj):
def _format_coroutine(coro):
assert iscoroutine(coro)
if not hasattr(coro, 'cr_code') and not hasattr(coro, 'gi_code'):
# Most likely a Cython coroutine.
coro_name = getattr(coro, '__qualname__', coro.__name__)
coro_name = '{}()'.format(coro_name)
running = False
try:
running = coro.cr_running
except AttributeError:
try:
running = coro.gi_running
except AttributeError:
pass
if running:
return '{} running'.format(coro_name)
else:
return coro_name
coro_name = None
if isinstance(coro, CoroWrapper):
func = coro.func