]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-95899: fix asyncio.Runner to call set_event_loop only once (GH-95900) (#96003)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 15 Aug 2022 22:01:23 +0000 (15:01 -0700)
committerGitHub <noreply@github.com>
Mon, 15 Aug 2022 22:01:23 +0000 (15:01 -0700)
(cherry picked from commit 914f6367a0d015986dafa7a9d542e24192753b6b)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
Lib/asyncio/runners.py
Lib/test/test_asyncio/test_runners.py
Misc/NEWS.d/next/Library/2022-08-11-18-52-17.gh-issue-95899._Bi4uG.rst [new file with mode: 0644]

index a19a7f99af064db2382f3d402b1d88ea354ef8be..b3e0c44b7fb59d1e7d90494f1a41aceb35f5b474 100644 (file)
@@ -115,8 +115,6 @@ class Runner:
 
         self._interrupt_count = 0
         try:
-            if self._set_event_loop:
-                events.set_event_loop(self._loop)
             return self._loop.run_until_complete(task)
         except exceptions.CancelledError:
             if self._interrupt_count > 0:
@@ -137,7 +135,11 @@ class Runner:
             return
         if self._loop_factory is None:
             self._loop = events.new_event_loop()
-            self._set_event_loop = True
+            if not self._set_event_loop:
+                # Call set_event_loop only once to avoid calling
+                # attach_loop multiple times on child watchers
+                events.set_event_loop(self._loop)
+                self._set_event_loop = True
         else:
             self._loop = self._loop_factory()
         if self._debug is not None:
index 5e1db2357e75f1da62528be4cf28a0e9542b6ed1..4e3acb97c85d372103af3413a2bbfb91b5a1ff5d 100644 (file)
@@ -456,6 +456,20 @@ class RunnerTests(BaseTest):
             ):
                 runner.run(coro())
 
+    def test_set_event_loop_called_once(self):
+        # See https://github.com/python/cpython/issues/95736
+        async def coro():
+            pass
+
+        policy = asyncio.get_event_loop_policy()
+        policy.set_event_loop = mock.Mock()
+        runner = asyncio.Runner()
+        runner.run(coro())
+        runner.run(coro())
+
+        self.assertEqual(1, policy.set_event_loop.call_count)
+        runner.close()
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-08-11-18-52-17.gh-issue-95899._Bi4uG.rst b/Misc/NEWS.d/next/Library/2022-08-11-18-52-17.gh-issue-95899._Bi4uG.rst
new file mode 100644 (file)
index 0000000..d2386cf
--- /dev/null
@@ -0,0 +1 @@
+Fix :class:`asyncio.Runner` to call :func:`asyncio.set_event_loop` only once to avoid calling :meth:`~asyncio.AbstractChildWatcher.attach_loop` multiple times on child watchers. Patch by Kumar Aditya.