Merge 3.6 (asyncio)

This commit is contained in:
Yury Selivanov 2016-11-08 19:16:37 -05:00
commit bb5e522d45
2 changed files with 12 additions and 4 deletions

View File

@ -262,8 +262,12 @@ 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__)
# Most likely a built-in type or a Cython coroutine.
# Built-in types might not have __qualname__ or __name__.
coro_name = getattr(
coro, '__qualname__',
getattr(coro, '__name__', type(coro).__name__))
coro_name = '{}()'.format(coro_name)
running = False

View File

@ -2384,8 +2384,6 @@ class HandleTests(test_utils.TestCase):
# (such as ones compiled with Cython).
class Coro:
__name__ = 'AAA'
def send(self, v):
pass
@ -2399,6 +2397,7 @@ class HandleTests(test_utils.TestCase):
pass
coro = Coro()
coro.__name__ = 'AAA'
self.assertTrue(asyncio.iscoroutine(coro))
self.assertEqual(coroutines._format_coroutine(coro), 'AAA()')
@ -2408,6 +2407,11 @@ class HandleTests(test_utils.TestCase):
coro.cr_running = True
self.assertEqual(coroutines._format_coroutine(coro), 'BBB() running')
coro = Coro()
# Some coroutines might not have '__name__', such as
# built-in async_gen.asend().
self.assertEqual(coroutines._format_coroutine(coro), 'Coro()')
class TimerTests(unittest.TestCase):