From: Mariatta <Mariatta@users.noreply.github.com>
Date: Fri, 9 Jun 2017 14:33:24 +0000 (-0700)
Subject: bpo-24755: Document asyncio.wrap_future (GH-603) (GH-2020)
X-Git-Tag: v3.5.4rc1~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fc2fa8cb909cb58325f56deb5cd500d278e4102;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit 824f6879121413e09439fffef54580413e44bf46)
---

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