From: Mariatta <Mariatta@users.noreply.github.com>
Date: Fri, 9 Jun 2017 14:32:46 +0000 (-0700)
Subject: bpo-24755: Document asyncio.wrap_future (GH-603) (GH-2019)
X-Git-Tag: v3.6.2rc1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af609a00a64fd58bd67c102f208ed9fe15c2748d;p=python

bpo-24755: Document asyncio.wrap_future (GH-603) (GH-2019)

(cherry picked from commit 824f6879121413e09439fffef54580413e44bf46)
---

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 558d17c096..804f1925b4 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