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
3a1c738e
Commit
3a1c738e
authored
Dec 18, 2014
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23074: asyncio.get_event_loop() now raises an exception if the thread
has no event loop even if assertions are disabled.
parent
2338156f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Lib/asyncio/base_events.py
Lib/asyncio/base_events.py
+1
-1
Lib/asyncio/events.py
Lib/asyncio/events.py
+3
-3
Lib/test/test_asyncio/test_events.py
Lib/test/test_asyncio/test_events.py
+2
-2
No files found.
Lib/asyncio/base_events.py
View file @
3a1c738e
...
...
@@ -420,7 +420,7 @@ class BaseEventLoop(events.AbstractEventLoop):
"""
try
:
current
=
events
.
get_event_loop
()
except
Assertion
Error
:
except
Runtime
Error
:
return
if
current
is
not
self
:
raise
RuntimeError
(
...
...
Lib/asyncio/events.py
View file @
3a1c738e
...
...
@@ -517,9 +517,9 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):
not
self
.
_local
.
_set_called
and
isinstance
(
threading
.
current_thread
(),
threading
.
_MainThread
)):
self
.
set_event_loop
(
self
.
new_event_loop
())
assert
self
.
_local
.
_loop
is
not
None
,
\
(
'There is no current event loop in thread %r.'
%
threading
.
current_thread
().
name
)
if
self
.
_local
.
_loop
is
None
:
raise
RuntimeError
(
'There is no current event loop in thread %r.'
%
threading
.
current_thread
().
name
)
return
self
.
_local
.
_loop
def
set_event_loop
(
self
,
loop
):
...
...
Lib/test/test_asyncio/test_events.py
View file @
3a1c738e
...
...
@@ -2252,14 +2252,14 @@ class PolicyTests(unittest.TestCase):
def
test_get_event_loop_after_set_none
(
self
):
policy
=
asyncio
.
DefaultEventLoopPolicy
()
policy
.
set_event_loop
(
None
)
self
.
assertRaises
(
Assertion
Error
,
policy
.
get_event_loop
)
self
.
assertRaises
(
Runtime
Error
,
policy
.
get_event_loop
)
@
mock
.
patch
(
'asyncio.events.threading.current_thread'
)
def
test_get_event_loop_thread
(
self
,
m_current_thread
):
def
f
():
policy
=
asyncio
.
DefaultEventLoopPolicy
()
self
.
assertRaises
(
Assertion
Error
,
policy
.
get_event_loop
)
self
.
assertRaises
(
Runtime
Error
,
policy
.
get_event_loop
)
th
=
threading
.
Thread
(
target
=
f
)
th
.
start
()
...
...
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