summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-09-15 17:24:03 (GMT)
committerYury Selivanov <yury@magic.io>2016-09-15 17:24:03 (GMT)
commit0a91d484a3e97710c3dc489ae6a17cc4a7d8d9de (patch)
tree67cba5131b6b97dd52e1d332980fb72145ab4f8f /Lib/asyncio
parent8987c9d219f0efb438f5d707a63d0a0a0f72b3ef (diff)
downloadcpython-0a91d484a3e97710c3dc489ae6a17cc4a7d8d9de.zip
cpython-0a91d484a3e97710c3dc489ae6a17cc4a7d8d9de.tar.gz
cpython-0a91d484a3e97710c3dc489ae6a17cc4a7d8d9de.tar.bz2
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/base_events.py24
1 files changed, 16 insertions, 8 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 9c2fa12..154fd95 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -242,9 +242,13 @@ class BaseEventLoop(events.AbstractEventLoop):
self._task_factory = None
self._coroutine_wrapper_set = False
- # A weak set of all asynchronous generators that are being iterated
- # by the loop.
- self._asyncgens = weakref.WeakSet()
+ if hasattr(sys, 'get_asyncgen_hooks'):
+ # Python >= 3.6
+ # A weak set of all asynchronous generators that are
+ # being iterated by the loop.
+ self._asyncgens = weakref.WeakSet()
+ else:
+ self._asyncgens = None
# Set to True when `loop.shutdown_asyncgens` is called.
self._asyncgens_shutdown_called = False
@@ -359,7 +363,9 @@ class BaseEventLoop(events.AbstractEventLoop):
"""Shutdown all active asynchronous generators."""
self._asyncgens_shutdown_called = True
- if not len(self._asyncgens):
+ if self._asyncgens is None or not len(self._asyncgens):
+ # If Python version is <3.6 or we don't have any asynchronous
+ # generators alive.
return
closing_agens = list(self._asyncgens)
@@ -387,9 +393,10 @@ class BaseEventLoop(events.AbstractEventLoop):
raise RuntimeError('Event loop is running.')
self._set_coroutine_wrapper(self._debug)
self._thread_id = threading.get_ident()
- old_agen_hooks = sys.get_asyncgen_hooks()
- sys.set_asyncgen_hooks(firstiter=self._asyncgen_firstiter_hook,
- finalizer=self._asyncgen_finalizer_hook)
+ if self._asyncgens is not None:
+ old_agen_hooks = sys.get_asyncgen_hooks()
+ sys.set_asyncgen_hooks(firstiter=self._asyncgen_firstiter_hook,
+ finalizer=self._asyncgen_finalizer_hook)
try:
while True:
self._run_once()
@@ -399,7 +406,8 @@ class BaseEventLoop(events.AbstractEventLoop):
self._stopping = False
self._thread_id = None
self._set_coroutine_wrapper(False)
- sys.set_asyncgen_hooks(*old_agen_hooks)
+ if self._asyncgens is not None:
+ sys.set_asyncgen_hooks(*old_agen_hooks)
def run_until_complete(self, future):
"""Run until the Future is done.