mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Closes #22429, asyncio: Fix EventLoop.run_until_complete(), don't stop the

Browse source 
event loop if a BaseException is raised, because the event loop is already
stopped.
This commit is contained in:
Victor Stinner 2014-12-05 01:44:10 +01:00
parent 4c85ec99f3
commit f3e2e09213
2 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/asyncio/base_events.py
View file

@ -102,6 +102,16 @@ def _raise_stop_error(*args):
raise _StopError
def _run_until_complete_cb(fut):
exc = fut._exception
if (isinstance(exc, BaseException)
and not isinstance(exc, Exception)):
# Issue #22429: run_forever() already finished, no need to
# stop it.
return
_raise_stop_error()
class Server(events.AbstractServer):
def __init__(self, loop, sockets):
@ -268,7 +278,7 @@ class BaseEventLoop(events.AbstractEventLoop):
# is no need to log the "destroy pending task" message
future._log_destroy_pending = False
future.add_done_callback(_raise_stop_error)
future.add_done_callback(_run_until_complete_cb)
try:
self.run_forever()
except:
@ -278,7 +288,7 @@ class BaseEventLoop(events.AbstractEventLoop):
# local task.
future.exception()
raise
future.remove_done_callback(_raise_stop_error)
future.remove_done_callback(_run_until_complete_cb)
if not future.done():
raise RuntimeError('Event loop stopped before Future completed.')