Docs and one small improvement for issue #25304, by Vincent Michel. (Merge 3.5->3.6.)

1 files changed, 6 insertions, 1 deletions

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 5a7bd9d..b887d88 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -704,7 +704,12 @@ def run_coroutine_threadsafe(coro, loop):
     future = concurrent.futures.Future()
 
     def callback():
-        futures._chain_future(ensure_future(coro, loop=loop), future)
+        try:
+            futures._chain_future(ensure_future(coro, loop=loop), future)
+        except Exception as exc:
+            if future.set_running_or_notify_cancel():
+                future.set_exception(exc)
+            raise
 
     loop.call_soon_threadsafe(callback)
     return future