From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 15 Sep 2015 02:42:41 +0000 (-0400)
Subject: Import t.p.asyncio automatically when available in gen.
X-Git-Tag: v4.3.0b1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0808146bbaa701a4ad46aaf79b5c80415fca6a;p=thirdparty%2Ftornado.git

Import t.p.asyncio automatically when available in gen.

This makes the _wrap_awaitable infinite recursion less likely
to occur, although it could show up again when another coroutine
framework adopts PEP 492.

Fixes #1499.
---

diff --git a/tornado/gen.py b/tornado/gen.py
index 34c3c2e07..a434c750e 100644
--- a/tornado/gen.py
+++ b/tornado/gen.py
@@ -1073,6 +1073,11 @@ def _argument_adapter(callback):
             callback(None)
     return wrapper
 
+# Convert Awaitables into Futures. It is unfortunately possible
+# to have infinite recursion here if those Awaitables assume that
+# we're using a different coroutine runner and yield objects
+# we don't understand. If that happens, the solution is to
+# register that runner's yieldable objects with convert_yielded.
 if sys.version_info >= (3, 3):
     exec(textwrap.dedent("""
     @coroutine
@@ -1157,3 +1162,19 @@ def convert_yielded(yielded):
 
 if singledispatch is not None:
     convert_yielded = singledispatch(convert_yielded)
+
+    try:
+        # If we can import t.p.asyncio, do it for its side effect
+        # (registering asyncio.Future with convert_yielded).
+        # It's ugly to do this here, but it prevents a cryptic
+        # infinite recursion in _wrap_awaitable.
+        # Note that even with this, asyncio integration is unlikely
+        # to work unless the application also configures AsyncIOLoop,
+        # but at least the error messages in that case are more
+        # comprehensible than a stack overflow.
+        import tornado.platform.asyncio
+    except ImportError:
+        pass
+    else:
+        # Reference the imported module to make pyflakes happy.
+        tornado