bpo-29703: asyncio: Fix creating new event loops in child processes. (#404)
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 28a45fc..7b30b4c 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -11,6 +11,7 @@
import functools
import inspect
+import os
import reprlib
import socket
import subprocess
@@ -611,6 +612,9 @@
# 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 @@
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 @@
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 99e3839..b12d5db 100644
--- a/Lib/asyncio/test_utils.py
+++ b/Lib/asyncio/test_utils.py
@@ -449,12 +449,15 @@
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)