changeset:   104964:61a237f3bb07
branch:      3.6
parent:      104961:d903a243c281
parent:      104963:abad0b9a35b3
user:        Yury Selivanov <yury@magic.io>
date:        Mon Nov 07 19:01:14 2016 -0500
description:
Merge 3.5 (issue #28613)


diff -r d903a243c281 -r 61a237f3bb07 Lib/asyncio/events.py
--- a/Lib/asyncio/events.py	Tue Nov 08 00:42:46 2016 +0100
+++ b/Lib/asyncio/events.py	Mon Nov 07 19:01:14 2016 -0500
@@ -6,6 +6,7 @@
            'get_event_loop_policy', 'set_event_loop_policy',
            'get_event_loop', 'set_event_loop', 'new_event_loop',
            'get_child_watcher', 'set_child_watcher',
+           '_set_running_loop', '_get_running_loop',
            ]
 
 import functools
diff -r d903a243c281 -r 61a237f3bb07 Lib/test/test_asyncio/test_events.py
--- a/Lib/test/test_asyncio/test_events.py	Tue Nov 08 00:42:46 2016 +0100
+++ b/Lib/test/test_asyncio/test_events.py	Mon Nov 07 19:01:14 2016 -0500
@@ -2732,9 +2732,11 @@
         try:
             asyncio.set_event_loop_policy(Policy())
             loop = asyncio.new_event_loop()
+            self.assertIs(asyncio._get_running_loop(), None)
 
             async def func():
                 self.assertIs(asyncio.get_event_loop(), loop)
+                self.assertIs(asyncio._get_running_loop(), loop)
 
             loop.run_until_complete(func())
         finally:
@@ -2742,6 +2744,8 @@
             if loop is not None:
                 loop.close()
 
+        self.assertIs(asyncio._get_running_loop(), None)
+
 
 if __name__ == '__main__':
     unittest.main()