summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-06-09 14:32:46 (GMT)
committerGitHub <noreply@github.com>2017-06-09 14:32:46 (GMT)
commitaf609a00a64fd58bd67c102f208ed9fe15c2748d (patch)
treec02d5945fbffacec45609c06e133f83ea86e8f29
parentc422959daca0598fabbefa5de4417ebce3b1da06 (diff)
downloadcpython-af609a00a64fd58bd67c102f208ed9fe15c2748d.zip
cpython-af609a00a64fd58bd67c102f208ed9fe15c2748d.tar.gz
cpython-af609a00a64fd58bd67c102f208ed9fe15c2748d.tar.bz2
bpo-24755: Document asyncio.wrap_future (GH-603) (GH-2019)
(cherry picked from commit 824f6879121413e09439fffef54580413e44bf46)
-rw-r--r--Doc/library/asyncio-task.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 558d17c..804f192 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -540,6 +540,11 @@ Task functions
.. deprecated:: 3.4.4
+.. function:: wrap_future(future, \*, loop=None)
+
+ Wrap a :class:`concurrent.futures.Future` object in a :class:`Future`
+ object.
+
.. function:: gather(\*coros_or_futures, loop=None, return_exceptions=False)
Return a future aggregating results from the given coroutine objects or