Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
99279ad8
Commit
99279ad8
authored
May 29, 2018
by
Yury Selivanov
Committed by
GitHub
May 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "bpo-22087: Fix Policy.get_event_loop() to detect fork (GH-7208)" (#7232)
This reverts commit
5d97b7bc
.
parent
dec947ca
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
42 deletions
+0
-42
Lib/asyncio/events.py
Lib/asyncio/events.py
+0
-7
Lib/test/test_asyncio/test_unix_events.py
Lib/test/test_asyncio/test_unix_events.py
+0
-32
Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst
...S.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst
+0
-3
No files found.
Lib/asyncio/events.py
View file @
99279ad8
...
...
@@ -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
)):
...
...
Lib/test/test_asyncio/test_unix_events.py
View file @
99279ad8
...
...
@@ -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
):
...
...
Misc/NEWS.d/next/Library/2018-05-29-12-06-54.bpo-22087.uv7_Y6.rst
deleted
100644 → 0
View file @
dec947ca
Fix Policy.get_event_loop() to detect fork and return a new loop.
Original patch by Dan O'Reilly.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment