From: Guido van Rossum <guido@python.org>
Date: Wed, 27 Nov 2013 18:37:13 +0000 (-0800)
Subject: asyncio: Fix get_event_loop() to call set_event_loop() when setting the loop. By... 
X-Git-Tag: v3.4.0b2~454
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cced076218b057067294f91f07df784aff8ea774;p=thirdparty%2FPython%2Fcpython.git

asyncio: Fix get_event_loop() to call set_event_loop() when setting the loop. By Anthony Baire.
---

diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 36ae312b079e..d429686b18a2 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -360,7 +360,7 @@ class BaseDefaultEventLoopPolicy(AbstractEventLoopPolicy):
         if (self._local._loop is None and
             not self._local._set_called and
             isinstance(threading.current_thread(), threading._MainThread)):
-            self._local._loop = self.new_event_loop()
+            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)
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 6abc72435af5..18411ecc246b 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1599,6 +1599,22 @@ class PolicyTests(unittest.TestCase):
         self.assertIs(loop, policy.get_event_loop())
         loop.close()
 
+    def test_get_event_loop_calls_set_event_loop(self):
+        policy = self.create_policy()
+
+        with unittest.mock.patch.object(
+                policy, "set_event_loop",
+                wraps=policy.set_event_loop) as m_set_event_loop:
+
+            loop = policy.get_event_loop()
+
+            # policy._local._loop must be set through .set_event_loop()
+            # (the unix DefaultEventLoopPolicy needs this call to attach
+            # the child watcher correctly)
+            m_set_event_loop.assert_called_with(loop)
+
+        loop.close()
+
     def test_get_event_loop_after_set_none(self):
         policy = self.create_policy()
         policy.set_event_loop(None)