mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge 3.5 (issue #28613)

Browse source
This commit is contained in:
Yury Selivanov 2016-11-04 14:30:11 -04:00
commit 69312fa4a2
18 changed files with 126 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/asyncio/base_events.py
View file

@ -393,7 +393,10 @@ class BaseEventLoop(events.AbstractEventLoop):
"""Run until stop() is called."""
self._check_closed()
if self.is_running():
raise RuntimeError('Event loop is running.')
raise RuntimeError('This event loop is already running')
if events._get_running_loop() is not None:
raise RuntimeError(
'Cannot run the event loop while another loop is running')
self._set_coroutine_wrapper(self._debug)
self._thread_id = threading.get_ident()
if self._asyncgens is not None:
@ -401,6 +404,7 @@ class BaseEventLoop(events.AbstractEventLoop):
sys.set_asyncgen_hooks(firstiter=self._asyncgen_firstiter_hook,
finalizer=self._asyncgen_finalizer_hook)
try:
events._set_running_loop(self)
while True:
self._run_once()
if self._stopping:
@ -408,6 +412,7 @@ class BaseEventLoop(events.AbstractEventLoop):
finally:
self._stopping = False
self._thread_id = None
events._set_running_loop(None)
self._set_coroutine_wrapper(False)
if self._asyncgens is not None:
sys.set_asyncgen_hooks(*old_agen_hooks)