From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 15 Feb 2025 09:55:08 +0000 (+0100)
Subject: [3.13] gh-130145: fix `loop.run_forever` when loop is already running (GH-130146... 
X-Git-Tag: v3.13.3~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a7b8c0f4d7aaa4868ec601e324b7df580f24b69;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-130145: fix `loop.run_forever` when loop is already running (GH-130146) (#130147)

gh-130145: fix `loop.run_forever` when loop is already running (GH-130146)
(cherry picked from commit a545749b0e6c56cab853c5c8df3c199b9707994f)

Co-authored-by: Kumar Aditya <kumaraditya@python.org>
---

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index b4a654c2dc2c..e19a364886ab 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -671,8 +671,8 @@ class BaseEventLoop(events.AbstractEventLoop):
 
     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:
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index c92bc81618c9..06a72aa79809 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -2889,6 +2889,22 @@ class GetEventLoopTestsMixin:
                 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
diff --git a/Misc/NEWS.d/next/Library/2025-02-15-07-50-37.gh-issue-130145.I0CkV0.rst b/Misc/NEWS.d/next/Library/2025-02-15-07-50-37.gh-issue-130145.I0CkV0.rst
new file mode 100644
index 000000000000..9c8c469bff56
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-02-15-07-50-37.gh-issue-130145.I0CkV0.rst
@@ -0,0 +1 @@
+Fix :meth:`!asyncio.AbstractEventloop.run_forever` when another loop is already running.