Issue #23074: asyncio.get_event_loop() now raises an exception if the thread

has no event loop even if assertions are disabled.
This commit is contained in:
Victor Stinner 2014-12-18 01:20:10 +01:00
parent 2338156fa4
commit 3a1c738e6c
3 changed files with 6 additions and 6 deletions

View File

@ -420,7 +420,7 @@ class BaseEventLoop(events.AbstractEventLoop):
""" """
try: try:
current = events.get_event_loop() current = events.get_event_loop()
except AssertionError: except RuntimeError:
return return
if current is not self: if current is not self:
raise RuntimeError( raise RuntimeError(

View File

@ -517,9 +517,9 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):
not self._local._set_called and not self._local._set_called and
isinstance(threading.current_thread(), threading._MainThread)): isinstance(threading.current_thread(), threading._MainThread)):
self.set_event_loop(self.new_event_loop()) self.set_event_loop(self.new_event_loop())
assert self._local._loop is not None, \ if self._local._loop is None:
('There is no current event loop in thread %r.' % raise RuntimeError('There is no current event loop in thread %r.'
threading.current_thread().name) % threading.current_thread().name)
return self._local._loop return self._local._loop
def set_event_loop(self, loop): def set_event_loop(self, loop):

View File

@ -2252,14 +2252,14 @@ class PolicyTests(unittest.TestCase):
def test_get_event_loop_after_set_none(self): def test_get_event_loop_after_set_none(self):
policy = asyncio.DefaultEventLoopPolicy() policy = asyncio.DefaultEventLoopPolicy()
policy.set_event_loop(None) policy.set_event_loop(None)
self.assertRaises(AssertionError, policy.get_event_loop) self.assertRaises(RuntimeError, policy.get_event_loop)
@mock.patch('asyncio.events.threading.current_thread') @mock.patch('asyncio.events.threading.current_thread')
def test_get_event_loop_thread(self, m_current_thread): def test_get_event_loop_thread(self, m_current_thread):
def f(): def f():
policy = asyncio.DefaultEventLoopPolicy() policy = asyncio.DefaultEventLoopPolicy()
self.assertRaises(AssertionError, policy.get_event_loop) self.assertRaises(RuntimeError, policy.get_event_loop)
th = threading.Thread(target=f) th = threading.Thread(target=f)
th.start() th.start()