diff -r 81c73f964066 Lib/test/test_asyncio/test_events.py --- a/Lib/test/test_asyncio/test_events.py Wed Dec 17 14:56:47 2014 +0200 +++ b/Lib/test/test_asyncio/test_events.py Wed Dec 17 23:45:23 2014 +0100 @@ -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(AssertionError, policy.get_event_loop) + self.assertRaises(RuntimeError, 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(AssertionError, policy.get_event_loop) + self.assertRaises(RuntimeError, policy.get_event_loop) th = threading.Thread(target=f) th.start() diff -r 81c73f964066 Lib/asyncio/events.py --- a/Lib/asyncio/events.py Wed Dec 17 14:56:47 2014 +0200 +++ b/Lib/asyncio/events.py Wed Dec 17 23:45:48 2014 +0100 @@ -517,9 +517,9 @@ class BaseDefaultEventLoopPolicy(Abstrac 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):