summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-06-24 00:36:00 +0200
committerVictor Stinner <victor.stinner@gmail.com>2014-06-24 00:36:00 +0200
commita37ce64cc12afff48f2dcc91153967d2ea52ca80 (patch)
treed7b64bc29056737bf082474fcb59af745a5c2485
parent443ff0adcfcba88c5ac0533d7be9830371ea8499 (diff)
downloadtrollius-a37ce64cc12afff48f2dcc91153967d2ea52ca80.tar.gz
Tornado doc
-rw-r--r--doc/index.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/index.rst b/doc/index.rst
index 6bd59ad..04adcdb 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -290,8 +290,10 @@ This option is used by the following projects which work on Trollius and Tulip:
performing one or several activities in different threads and/or processes.
Trollius 0.3 requires Pulsar 0.8.2 or later. Pulsar uses the ``asyncio``
module if available, or import ``trollius``.
-* It looks like `Tornado <http://www.tornadoweb.org/>`_ supports Tulip and
- Trollius.
+* `Tornado <http://www.tornadoweb.org/>`_ supports Tulip and Trollius since
+ Tornado 3.2: `tornado.platform.asyncio — Bridge between asyncio and Tornado
+ <http://tornado.readthedocs.org/en/latest/asyncio.html>`_. It tries to import
+ asyncio or fallback on importing trollius.
Another option is to provide functions returning ``Future`` objects, so the
caller can decide to use callback using ``fut.add_done_callback(callback)`` or