Merge heads 3.6

2016-09-15 13:37:16 -04:00 · 2016-09-15 13:37:16 -04:00 · 097a49e3e9
parent 4af23d7ddd b26067a92f
commit 097a49e3e9
1 changed files with 1 additions and 4 deletions
--- a/Lib/asyncio/coroutines.py
+++ b/Lib/asyncio/coroutines.py
@ -276,10 +276,7 @@ def _format_coroutine(coro):
    try:
        coro_code = coro.gi_code
    except AttributeError:
-        try:
-            coro_code = coro.cr_code
-        except AttributeError:
-            return repr(coro)
+        coro_code = coro.cr_code

    try:
        coro_frame = coro.gi_frame