Skip to content

Commit c3ac9f5

Browse files
committedMay 29, 2018
Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (pythonGH-7208)"
This reverts commit 5d97b7b.
1 parent 6f75bae commit c3ac9f5

File tree

3 files changed

+0
-42
lines changed

3 files changed

+0
-42
lines changed
 

‎Lib/asyncio/events.py

-7
Original file line numberDiff line numberDiff line change
@@ -625,23 +625,16 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):
625625

626626
class _Local(threading.local):
627627
_loop = None
628-
_pid = None
629628
_set_called = False
630629

631630
def __init__(self):
632631
self._local = self._Local()
633-
self._local._pid = os.getpid()
634632

635633
def get_event_loop(self):
636634
"""Get the event loop.
637635
638636
This may be None or an instance of EventLoop.
639637
"""
640-
if self._local._pid != os.getpid():
641-
# If we detect we're in a child process forked by multiprocessing,
642-
# we reset self._local so that we'll get a new event loop.
643-
self._local = self._Local()
644-
645638
if (self._local._loop is None and
646639
not self._local._set_called and
647640
isinstance(threading.current_thread(), threading._MainThread)):

‎Lib/test/test_asyncio/test_unix_events.py

-32
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import tempfile
1414
import threading
1515
import unittest
16-
import multiprocessing
1716
from unittest import mock
1817
from test import support
1918

@@ -1805,37 +1804,6 @@ def create_watcher(self):
18051804
return asyncio.FastChildWatcher()
18061805

18071806

1808-
class ForkedProcessTests(unittest.TestCase):
1809-
def setUp(self):
1810-
self.parent_loop = asyncio.SelectorEventLoop()
1811-
asyncio.set_event_loop(self.parent_loop)
1812-
self.ctx = multiprocessing.get_context("fork")
1813-
1814-
def tearDown(self):
1815-
self.parent_loop.close()
1816-
1817-
def _check_loops_not_equal(self, old_loop):
1818-
loop = asyncio.get_event_loop()
1819-
if loop is old_loop:
1820-
raise RuntimeError("Child process inherited parent's event loop")
1821-
1822-
try:
1823-
val = loop.run_until_complete(asyncio.sleep(0.05, result=42))
1824-
if val != 42:
1825-
raise RuntimeError("new event loop does not work")
1826-
finally:
1827-
loop.close()
1828-
1829-
sys.exit(loop is old_loop)
1830-
1831-
def test_new_loop_in_child(self):
1832-
p = self.ctx.Process(target=self._check_loops_not_equal,
1833-
args=(self.parent_loop,))
1834-
p.start()
1835-
p.join()
1836-
self.assertEqual(p.exitcode, 0)
1837-
1838-
18391807
class PolicyTests(unittest.TestCase):
18401808

18411809
def create_policy(self):

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

-3
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.