diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-05-26 11:26:54 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-05-26 11:26:54 +0200 |
commit | 3fce70f75c052a6986146f93c3f885f8937601ba (patch) | |
tree | 161eaab603a9192f4fa56248881359599ec8bc44 | |
parent | 37b60659caeb68de6d27a461d4cc5440cc2e34ca (diff) | |
download | trollius-3fce70f75c052a6986146f93c3f885f8937601ba.tar.gz |
adjust doc: document that trollius is not yet fully compatible with tulip
-rw-r--r-- | doc/index.rst | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/doc/index.rst b/doc/index.rst index 404173d..da205ed 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -238,11 +238,6 @@ the top of your file:: # Use Trollius on Python <= 3.2 import trollius as asyncio -.. note:: - - The Trollius module was called ``asyncio`` in Trollius version 0.2. The - module name changed to ``trollius`` to support Python 3.4. - It is possible to write code working on both projects using only callbacks. This option is used by the following projects which work on Trollius and Tulip: @@ -261,6 +256,16 @@ to use coroutines (``yield From(fut)`` for Trollius, or ``yield from fut`` for Tulip). This option is used by the `aiodns <https://github.com/saghul/aiodns>`_ project for example. +It is possible to write an application working on Trollius or asyncio with the +same code base, but it is not possible yet to run an application using Tulip +using a module using Trollius. The module must use the same module than +modules. + +.. note:: + + The Trollius module was called ``asyncio`` in Trollius version 0.2. The + module name changed to ``trollius`` to support Python 3.4. + Run tests ========= @@ -339,7 +344,7 @@ Change log Version 0.3 ----------- -Rename the Python module ``asyncio`` to "trollius`` to support Python 3.4. +Rename the Python module ``asyncio`` to ``trollius`` to support Python 3.4. On Python 3.4, there is already a module called ``asyncio`` in the standard library which conflicts with Trollius ``asyncio`` (of Trollius 0.2). To write |