[Python-checkins] cpython (merge 3.6 -> 3.6): Merge heads 3.6

[yury.selivanov]

https://hg.python.org/cpython/rev/976c487dfda2
changeset:   103823:976c487dfda2
branch:      3.6
parent:      103819:9e0fcfac287a
parent:      103821:82363ff1eaab
user:        Yury Selivanov <yury at magic.io>
date:        Thu Sep 15 13:37:16 2016 -0400
summary:
  Merge heads 3.6

files:
  Lib/asyncio/coroutines.py |  5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
--- a/Lib/asyncio/coroutines.py
+++ b/Lib/asyncio/coroutines.py
@@ -276,10 +276,7 @@
     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

-- 
Repository URL: https://hg.python.org/cpython