bpo-36613: call remove_done_callback if exception (GH-12800)

gescheit · miss-islington · commit c1964e9e2177 · 2019-05-03T08:18:02.000-07:00
Call remove_done_callback() in finally block. https://bugs.python.org/issue36613
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
@@ -495,10 +495,11 @@ def _on_completion(f):
     finally:
         if timeout_handle is not None:
             timeout_handle.cancel()
+        for f in fs:
+            f.remove_done_callback(_on_completion)
 
     done, pending = set(), set()
     for f in fs:
-        f.remove_done_callback(_on_completion)
         if f.done():
             done.add(f)
         else:
diff --git a/Misc/NEWS.d/next/Library/2019-04-12-13-52-15.bpo-36613.hqT1qn.rst b/Misc/NEWS.d/next/Library/2019-04-12-13-52-15.bpo-36613.hqT1qn.rst
@@ -0,0 +1 @@
+Fix :mod:`asyncio` wait() not removing callback if exception

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix :mod:`asyncio` wait() not removing callback if exception