Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Guido van Rossum 2013-11-27 10:37:13 -08:00
parent 1314ef73d0
commit cced076218
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/asyncio/events.py
View file

@ -360,7 +360,7 @@ def get_event_loop(self):
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)

16
Lib/test/test_asyncio/test_events.py
View file

@ -1599,6 +1599,22 @@ def test_get_event_loop(self):
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)