From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 18 Dec 2014 00:20:10 +0000 (+0100)
Subject: Issue #23074: asyncio.get_event_loop() now raises an exception if the thread
X-Git-Tag: v3.4.3rc1~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a1c738e6cf09d0972809fa431bf77dd564ff713;p=thirdparty%2FPython%2Fcpython.git

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 0c7316ea97b1..b1a5422be30f 100644
--- 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 806218f61b71..8a7bb814a319 100644
--- 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 6644fbeab637..d7e2f3488d59 100644
--- 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()