bpo-29703: asyncio: Fix creating new event loops in child processes. (#411)

diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 28a45fc3cc5aee50496d6c56db1c8772ba3f209b..7b30b4c84ad9a79fb5fcb2a64baefc5f75573526 100644 (file)
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -11,6 +11,7 @@ __all__ = ['AbstractEventLoopPolicy',
 
 import functools
 import inspect
+import os
 import reprlib
 import socket
 import subprocess
@@ -611,6 +612,9 @@ _lock = threading.Lock()
 # A TLS for the running event loop, used by _get_running_loop.
 class _RunningLoop(threading.local):
     _loop = None
+    _pid = None
+
+
 _running_loop = _RunningLoop()
 
 
@@ -620,7 +624,8 @@ def _get_running_loop():
     This is a low-level function intended to be used by event loops.
     This function is thread-specific.
     """
-    return _running_loop._loop
+    if _running_loop._pid == os.getpid():
+        return _running_loop._loop
 
 
 def _set_running_loop(loop):
@@ -629,6 +634,7 @@ def _set_running_loop(loop):
     This is a low-level function intended to be used by event loops.
     This function is thread-specific.
     """
+    _running_loop._pid = os.getpid()
     _running_loop._loop = loop
 
 

diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py
index 9d32822fa9e451402773f16dd49b67f08612517b..fe90b9c29897f4613f9ff935ad02f8394c8cc0f3 100644 (file)
--- a/Lib/asyncio/test_utils.py
+++ b/Lib/asyncio/test_utils.py
@@ -449,12 +449,15 @@ class TestCase(unittest.TestCase):
         self.set_event_loop(loop)
         return loop
 
+    def unpatch_get_running_loop(self):
+        events._get_running_loop = self._get_running_loop
+
     def setUp(self):
         self._get_running_loop = events._get_running_loop
         events._get_running_loop = lambda: None
 
     def tearDown(self):
-        events._get_running_loop = self._get_running_loop
+        self.unpatch_get_running_loop()
 
         events.set_event_loop(None)
 

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 28d92a9f4e3eac21e2aed7993f0e60dbd7ff1e89..802763bd11ff611ee221904080dd62aa4566afd0 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1,6 +1,7 @@
 """Tests for events.py."""
 
 import collections.abc
+import concurrent.futures
 import functools
 import gc
 import io
@@ -57,6 +58,15 @@ def osx_tiger():
     return version < (10, 5)
 
 
+def _test_get_event_loop_new_process__sub_proc():
+    async def doit():
+        return 'hello'
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    return loop.run_until_complete(doit())
+
+
 ONLYCERT = data_file('ssl_cert.pem')
 ONLYKEY = data_file('ssl_key.pem')
 SIGNED_CERTFILE = data_file('keycert3.pem')
@@ -2181,6 +2191,18 @@ else:
             asyncio.set_child_watcher(None)
             super().tearDown()
 
+        def test_get_event_loop_new_process(self):
+            async def main():
+                pool = concurrent.futures.ProcessPoolExecutor()
+                return await self.loop.run_in_executor(
+                    pool, _test_get_event_loop_new_process__sub_proc)
+
+            self.unpatch_get_running_loop()
+
+            self.assertEqual(
+                self.loop.run_until_complete(main()),
+                'hello')
+
     if hasattr(selectors, 'KqueueSelector'):
         class KqueueEventLoopTests(UnixEventLoopTestsMixin,
                                    SubprocessTestsMixin,

diff --git a/Misc/NEWS b/Misc/NEWS
index fd25a5f325077e28ed8fa7335d1d2f7fa4054fbf..32741ce1e7d958317484ab8d333c76d2a06afa4c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@ Extension Modules
 Library
 -------
 
+- bpo-29703: Fix asyncio to support instantiation of new event loops
+  in child processes.
+
 - bpo-29376: Fix assertion error in threading._DummyThread.is_alive().
 
 - bpo-29110: Fix file object leak in aifc.open() when file is given as a