[3.5] Ignore done tasks (#3500)

* Fix #3497: Ignore done tasks when cancels pending activities on web.run_app finalization. (cherry picked from commit 4e99e81) Co-authored-by: Andrew Svetlov <[email protected]>
aio-libs · Jan 8, 2019 · a3d18a8 · a3d18a8
1 parent 396ec1f
commit a3d18a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES/3497.bugfix b/CHANGES/3497.bugfix
@@ -0,0 +1 @@
+Ignore done tasks when cancels pending activities on ``web.run_app`` finalization.
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -63,10 +63,15 @@
     from typing_extensions import ContextManager
 
 
-all_tasks = asyncio.Task.all_tasks
+def all_tasks(
+        loop: Optional[asyncio.AbstractEventLoop] = None
+) -> Set['asyncio.Task[Any]']:
+    tasks = list(asyncio.Task.all_tasks(loop))  # type: ignore
+    return {t for t in tasks if not t.done()}
+
 
 if PY_37:
-    all_tasks = getattr(asyncio, 'all_tasks')  # use the trick to cheat mypy
+    all_tasks = getattr(asyncio, 'all_tasks')  # noqa
 
 
 _T = TypeVar('_T')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Ignore done tasks when cancels pending activities on ``web.run_app`` finalization.