concurrent: Update docs

diff --git a/docs/concurrent.rst b/docs/concurrent.rst
index 5904a60b8923c611cad2a485e53b55b423445fc9..f7a855a38f0e38e13c92c497f3fdcde5e9db5b94 100644 (file)
--- a/docs/concurrent.rst
+++ b/docs/concurrent.rst
@@ -11,9 +11,7 @@
 
      .. class:: Future
 
-        ``tornado.concurrent.Future`` is an alias for `asyncio.Future`
-        on Python 3. On Python 2, it provides an equivalent
-        implementation.
+        ``tornado.concurrent.Future`` is an alias for `asyncio.Future`.
 
         In Tornado, the main way in which applications interact with
         ``Future`` objects is by ``awaiting`` or ``yielding`` them in

diff --git a/tornado/concurrent.py b/tornado/concurrent.py
index df12da87f0b6218a5cf1944d5dddf654e192c207..b7bb15c0181f5cdeced5c2f4a4f60dccf4b4d806 100644 (file)
--- a/tornado/concurrent.py
+++ b/tornado/concurrent.py
@@ -14,17 +14,15 @@
 # under the License.
 """Utilities for working with ``Future`` objects.
 
-``Futures`` are a pattern for concurrent programming introduced in
-Python 3.2 in the `concurrent.futures` package, and also adopted (in a
-slightly different form) in Python 3.4's `asyncio` package. This
-package defines a ``Future`` class that is an alias for `asyncio.Future`
-when available, and a compatible implementation for older versions of
-Python. It also includes some utility functions for interacting with
-``Future`` objects.
-
-While this package is an important part of Tornado's internal
+Tornado previously provided its own ``Future`` class, but now uses
+`asyncio.Future`. This module contains utility functions for working
+with `asyncio.Future` in a way that is backwards-compatible with
+Tornado's old ``Future`` implementation.
+
+While this module is an important part of Tornado's internal
 implementation, applications rarely need to interact with it
 directly.
+
 """
 
 import asyncio