diff options
| author | Guido van Rossum <guido@python.org> | 2015-10-05 23:23:13 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2015-10-05 23:23:13 (GMT) |
| commit | 5db034acfaa79447cb5c310f6ad7071737474027 (patch) | |
| tree | 10e7f0bb14217141160e64c94fdf957785ec7637 /Lib/asyncio/tasks.py | |
| parent | f0ccf02e5609890ffb1f928e1a1f74ebde1b5af7 (diff) | |
| parent | 601953b67958572162d0ab7d3f24c07340ad9dbb (diff) | |
| download | cpython-5db034acfaa79447cb5c310f6ad7071737474027.zip cpython-5db034acfaa79447cb5c310f6ad7071737474027.tar.gz cpython-5db034acfaa79447cb5c310f6ad7071737474027.tar.bz2 | |
Docs and one small improvement for issue #25304, by Vincent Michel. (Merge 3.4->3.5.)
Diffstat (limited to 'Lib/asyncio/tasks.py')
| -rw-r--r-- | Lib/asyncio/tasks.py | 7 |
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 |