Skip to content

Commit

Permalink
Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)…
Browse files Browse the repository at this point in the history
…" (#7232)

This reverts commit 5d97b7b.
  • Loading branch information
1st1 authored May 30, 2018
1 parent dec947c commit 99279ad
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 42 deletions.
7 changes: 0 additions & 7 deletions Lib/asyncio/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)):
Expand Down
32 changes: 0 additions & 32 deletions Lib/test/test_asyncio/test_unix_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import tempfile
import threading
import unittest
import multiprocessing
from unittest import mock
from test import support

Expand Down Expand Up @@ -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):
Expand Down

This file was deleted.

0 comments on commit 99279ad

Please sign in to comment.