Merge 3.5 (issue #28613)

This commit is contained in:
Yury Selivanov 2016-11-07 19:01:14 -05:00
commit 1994dd360b
2 changed files with 5 additions and 0 deletions

View File

@ -6,6 +6,7 @@ __all__ = ['AbstractEventLoopPolicy',
'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

View File

@ -2732,9 +2732,11 @@ class PolicyTests(unittest.TestCase):
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 @@ class PolicyTests(unittest.TestCase):
if loop is not None:
loop.close()
self.assertIs(asyncio._get_running_loop(), None)
if __name__ == '__main__':
unittest.main()