merge heads

1 files changed, 7 insertions, 5 deletions

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index e6fd3d3..eaf93f8 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -32,12 +32,12 @@ from .log import logger
 _DEBUG = (not sys.flags.ignore_environment
           and bool(os.environ.get('PYTHONASYNCIODEBUG')))
 
+_PY35 = (sys.version_info >= (3, 5))
+
 
 class CoroWrapper:
     # Wrapper for coroutine in _DEBUG mode.
 
-    __slots__ = ['gen', 'func', '__name__', '__doc__', '__weakref__']
-
     def __init__(self, gen, func):
         assert inspect.isgenerator(gen), gen
         self.gen = gen
@@ -111,8 +111,10 @@ def coroutine(func):
         @functools.wraps(func)
         def wrapper(*args, **kwds):
             w = CoroWrapper(coro(*args, **kwds), func)
-            w.__name__ = coro.__name__
-            w.__doc__ = coro.__doc__
+            w.__name__ = func.__name__
+            if _PY35:
+                w.__qualname__ = func.__qualname__
+            w.__doc__ = func.__doc__
             return w
 
     wrapper._is_coroutine = True  # For iscoroutinefunction().
@@ -190,7 +192,7 @@ class Task(futures.Future):
             i = len(res)
         text = self._coro.__name__
         coro = self._coro
-        if inspect.isgenerator(coro):
+        if iscoroutine(coro):
             filename = coro.gi_code.co_filename
             if coro.gi_frame is not None:
                 text += ' at %s:%s' % (filename, coro.gi_frame.f_lineno)