From 99279ad823a758288e4e41962abfc4dad8943ce8 Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Tue, 29 May 2018 20:47:56 -0400 Subject: [PATCH] Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)" (#7232) This reverts commit 5d97b7bcc19496617bf8c448d2f149cc28c73bc7. --- Lib/asyncio/events.py | 7 ---- Lib/test/test_asyncio/test_unix_events.py | 32 ------------------- .../2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst | 3 -- 3 files changed, 42 deletions(-) delete mode 100644 Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py index 68dc25e1e8..40946bbf65 100644 --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -625,23 +625,16 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy): class _Local(threading.local): _loop = None - _pid = None _set_called = False def __init__(self): self._local = self._Local() - self._local._pid = os.getpid() def get_event_loop(self): """Get the event loop. This may be None or an instance of EventLoop. """ - 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() - if (self._local._loop is None and not self._local._set_called and isinstance(threading.current_thread(), threading._MainThread)): diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 1bc2d8658d..a01efedf66 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -13,7 +13,6 @@ import sys import tempfile import threading import unittest -import multiprocessing from unittest import mock from test import support @@ -1805,37 +1804,6 @@ class FastChildWatcherTests (ChildWatcherTestsMixin, test_utils.TestCase): 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): diff --git a/Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst b/Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst deleted file mode 100644 index 92127cd57a..0000000000 --- a/Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst +++ /dev/null @@ -1,3 +0,0 @@ -Fix Policy.get_event_loop() to detect fork and return a new loop. - -Original patch by Dan O'Reilly. -- 2.50.0