Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/asyncio/base_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,8 @@ def _run_forever_cleanup(self):

def run_forever(self):
"""Run until stop() is called."""
self._run_forever_setup()
try:
self._run_forever_setup()
while True:
self._run_once()
if self._stopping:
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_asyncio/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -3004,6 +3004,22 @@ async def main():
self.loop.run_until_complete(main()),
'hello')

def test_get_running_loop_already_running(self):
async def main():
running_loop = asyncio.get_running_loop()
loop = asyncio.new_event_loop()
try:
loop.run_forever()
except RuntimeError:
pass
else:
self.fail("RuntimeError not raised")

self.assertIs(asyncio.get_running_loop(), running_loop)

self.loop.run_until_complete(main())


def test_get_event_loop_returns_running_loop(self):
class TestError(Exception):
pass
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix :meth:`!asyncio.AbstractEventloop.run_forever` when another loop is already running.
Loading