[3.6] bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)

Lib/asyncio/events.py

@@ -583,16 +583,29 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):
 
     class _Local(threading.local):
         _loop = None
+        _pid = None
         _set_called = False
 
+        def __init__(self):
+            super().__init__()
+            self._pid = os.getpid()
+
     def __init__(self):
         self._local = self._Local()
 
+    def _check_pid(self):
+        if self._local._pid != os.getpid():
+            # If we detect we're in a child process forked by multiprocessing,
+            # we reset self._local so that we'll get a new event loop.
+            self._local = self._Local()
+
     def get_event_loop(self):
         """Get the event loop.
 
         This may be None or an instance of EventLoop.
         """
+        self._check_pid()
+
         if (self._local._loop is None and
             not self._local._set_called and
             isinstance(threading.current_thread(), threading._MainThread)):
@@ -604,6 +617,7 @@ def get_event_loop(self):
 
     def set_event_loop(self, loop):
         """Set the event loop."""
+        self._check_pid()
         self._local._set_called = True
         assert loop is None or isinstance(loop, AbstractEventLoop)
         self._local._loop = loop

Lib/test/test_asyncio/test_unix_events.py

@@ -3,6 +3,7 @@
 import collections
 import errno
 import io
+import multiprocessing
 import os
 import pathlib
 import signal
@@ -12,7 +13,6 @@
 import tempfile
 import threading
 import unittest
-import warnings
 from unittest import mock
 
 if sys.platform == 'win32':
@@ -1556,6 +1556,37 @@ def create_watcher(self):
         return asyncio.FastChildWatcher()
 
 
+class ForkedProcessTests(unittest.TestCase):
+    def setUp(self):
+        self.parent_loop = asyncio.SelectorEventLoop()
+        asyncio.set_event_loop(self.parent_loop)
+        self.ctx = multiprocessing.get_context("fork")
+
+    def tearDown(self):
+        self.parent_loop.close()
+
+    def _check_loops_not_equal(self, old_loop):
+        loop = asyncio.get_event_loop()
+        if loop is old_loop:
+            raise RuntimeError("Child process inherited parent's event loop")
+
+        try:
+            val = loop.run_until_complete(asyncio.sleep(0.05, result=42))
+            if val != 42:
+                raise RuntimeError("new event loop does not work")
+        finally:
+            loop.close()
+
+        sys.exit(loop is old_loop)
+
+    def test_new_loop_in_child(self):
+        p = self.ctx.Process(target=self._check_loops_not_equal,
+                             args=(self.parent_loop,))
+        p.start()
+        p.join()
+        self.assertEqual(p.exitcode, 0)
+
+
 class PolicyTests(unittest.TestCase):
 
     def create_policy(self):

Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst

@@ -0,0 +1,3 @@
+Fix Policy.get_event_loop() to detect fork and return a new loop.
+
+Original patch by Dan O'Reilly.