Fix #39191: Don't spawn a task before failing (#17796)

This commit is contained in:
Andrew Svetlov 2020-01-04 11:10:14 +02:00 committed by GitHub
parent e02ab59fdf
commit 3a5de51159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions

View File

@ -573,14 +573,17 @@ class BaseEventLoop(events.AbstractEventLoop):
except Exception as ex:
self.call_soon_threadsafe(future.set_exception, ex)
def run_forever(self):
"""Run until stop() is called."""
self._check_closed()
def _check_runnung(self):
if self.is_running():
raise RuntimeError('This event loop is already running')
if events._get_running_loop() is not None:
raise RuntimeError(
'Cannot run the event loop while another loop is running')
def run_forever(self):
"""Run until stop() is called."""
self._check_closed()
self._check_runnung()
self._set_coroutine_origin_tracking(self._debug)
self._thread_id = threading.get_ident()
@ -612,6 +615,7 @@ class BaseEventLoop(events.AbstractEventLoop):
Return the Future's result, or raise its exception.
"""
self._check_closed()
self._check_runnung()
new_task = not futures.isfuture(future)
future = tasks.ensure_future(future, loop=self)

View File

@ -0,0 +1,3 @@
Perform a check for running loop before starting a new task in
``loop.run_until_complete()`` to fail fast; it prevents the side effect of
new task spawning before exception raising.