bpo-32610: Fix asyncio.all_tasks() to return only pending tasks. (GH-7174)
(cherry picked from commit 416c1ebd9896b394790dcb4f9f035b1a44ebe9ff)
Co-authored-by: Yury Selivanov <yury@magic.io>
diff --git a/Lib/asyncio/__init__.py b/Lib/asyncio/__init__.py
index 23ea055..2685902 100644
--- a/Lib/asyncio/__init__.py
+++ b/Lib/asyncio/__init__.py
@@ -18,6 +18,10 @@
from .tasks import *
from .transports import *
+# Exposed for _asynciomodule.c to implement now deprecated
+# Task.all_tasks() method. This function will be removed in 3.9.
+from .tasks import _all_tasks_compat # NoQA
+
__all__ = (base_events.__all__ +
coroutines.__all__ +
events.__all__ +
diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index bb54b72..5fbab03 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -51,8 +51,7 @@
def _cancel_all_tasks(loop):
- to_cancel = [task for task in tasks.all_tasks(loop)
- if not task.done()]
+ to_cancel = tasks.all_tasks(loop)
if not to_cancel:
return
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 4a9db2a..67fb57c 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -34,6 +34,16 @@
def all_tasks(loop=None):
"""Return a set of all tasks for the loop."""
if loop is None:
+ loop = events.get_running_loop()
+ return {t for t in _all_tasks
+ if futures._get_loop(t) is loop and not t.done()}
+
+
+def _all_tasks_compat(loop=None):
+ # Different from "all_task()" by returning *all* Tasks, including
+ # the completed ones. Used to implement deprecated "Tasks.all_task()"
+ # method.
+ if loop is None:
loop = events.get_event_loop()
return {t for t in _all_tasks if futures._get_loop(t) is loop}
@@ -82,7 +92,7 @@
"use asyncio.all_tasks() instead",
PendingDeprecationWarning,
stacklevel=2)
- return all_tasks(loop)
+ return _all_tasks_compat(loop)
def __init__(self, coro, *, loop=None):
super().__init__(loop=loop)