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

has no event loop even if assertions are disabled.

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 0c7316ea97b1ac25e4d8ab1e976a7a6238f606da..b1a5422be30fe40205a61a5a60c8f2838f132710 100644 (file)
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -420,7 +420,7 @@ class BaseEventLoop(events.AbstractEventLoop):
         """
         try:
             current = events.get_event_loop()
-        except AssertionError:
+        except RuntimeError:
             return
         if current is not self:
             raise RuntimeError(

diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 806218f61b710ff5a030b7c70f54930af37124a4..8a7bb814a31939daa8931861d0e71f1af819ce03 100644 (file)
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -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):

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 6644fbeab637f634a4f9b8140ddc9f4bfdb758c4..d7e2f3488d59b5991d84422ecc5ff97b734f9326 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -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()