summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-06-23 13:14:13 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-06-23 13:14:13 (GMT)
commit751c7c0f2db30a8a29383ec105d200991c209fe8 (patch)
treeafe131225d9f4a05132344d24bf95838917cf304
parent1c99bc84bd6bdc4fa2526424bb0db99a11facf48 (diff)
downloadcpython-751c7c0f2db30a8a29383ec105d200991c209fe8.zip
cpython-751c7c0f2db30a8a29383ec105d200991c209fe8.tar.gz
cpython-751c7c0f2db30a8a29383ec105d200991c209fe8.tar.bz2
asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop()
raises an exception if there is no current loop
-rw-r--r--Lib/asyncio/base_events.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 42d8b0b..b127142 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -332,8 +332,11 @@ class BaseEventLoop(events.AbstractEventLoop):
Should only be called when (self._debug == True). The caller is
responsible for checking this condition for performance reasons.
"""
- current = events.get_event_loop()
- if current is not None and current is not self:
+ try:
+ current = events.get_event_loop()
+ except AssertionError:
+ return
+ if current is not self:
raise RuntimeError(
"non-threadsafe operation invoked on an event loop other "
"than the current one")