[Python-checkins] cpython (3.4): asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop()

[victor.stinner]

http://hg.python.org/cpython/rev/389ef84c2823
changeset:   91346:389ef84c2823
branch:      3.4
parent:      91343:404dcd29b0a6
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Jun 23 15:14:13 2014 +0200
summary:
  asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop()
raises an exception if there is no current loop

files:
  Lib/asyncio/base_events.py |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -332,8 +332,11 @@
         Should only be called when (self._debug == True). The caller is
         responsible for checking this condition for performance reasons.
         """
-        current = events.get_event_loop()
-        if current is not None and current is not self:
+        try:
+            current = events.get_event_loop()
+        except AssertionError:
+            return
+        if current is not self:
             raise RuntimeError(
                 "non-threadsafe operation invoked on an event loop other "
                 "than the current one")

-- 
Repository URL: http://hg.python.org/cpython