bpo-32636: Fix @asyncio.coroutine debug mode bug exposed by gh-5250 (#…

…5291)
python · Jan 24, 2018 · fb5a7ad · fb5a7ad
1 parent 0a5e71b
commit fb5a7ad
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
@@ -132,8 +132,9 @@ def coro(*args, **kw):
                         res = yield from await_meth()
             return res
 
+    coro = types.coroutine(coro)
     if not _DEBUG:
-        wrapper = types.coroutine(coro)
+        wrapper = coro
     else:
         @functools.wraps(func)
         def wrapper(*args, **kwds):

diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
@@ -9,6 +9,7 @@
 import random
 import re
 import sys
+import textwrap
 import types
 import unittest
 import weakref
@@ -3090,6 +3091,22 @@ async def inner():
         result = self.loop.run_until_complete(inner())
         self.assertEqual(['ok1', 'ok2'], result)
 
+    def test_debug_mode_interop(self):
+        # https://bugs.python.org/issue32636
+        code = textwrap.dedent("""
+            import asyncio
+
+            async def native_coro():
+                pass
+
+            @asyncio.coroutine
+            def old_style_coro():
+                yield from native_coro()
+
+            asyncio.run(old_style_coro())
+        """)
+        assert_python_ok("-c", code, PYTHONASYNCIODEBUG="1")
+
 
 if __name__ == '__main__':
     unittest.main()