[Python-checkins] Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)" (#7232)

Tue May 29 20:47:59 EDT 2018

https://github.com/python/cpython/commit/99279ad823a758288e4e41962abfc4dad8943ce8
commit: 99279ad823a758288e4e41962abfc4dad8943ce8
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2018年05月29日T20:47:56-04:00
summary:
Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)" (#7232)
This reverts commit 5d97b7bcc19496617bf8c448d2f149cc28c73bc7.
files:
D Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst
M Lib/asyncio/events.py
M Lib/test/test_asyncio/test_unix_events.py

diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 68dc25e1e8be..40946bbf6529 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 1bc2d8658d8a..a01efedf66d9 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -13,7 +13,6 @@
 import tempfile
 import threading
 import unittest
-import multiprocessing
 from unittest import mock
 from test import support
 
@@ -1805,37 +1804,6 @@ 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):
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 92127cd57a91..000000000000
--- 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.
