summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgescheit <gescheit12@gmail.com>2019-05-03 15:18:02 (GMT)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-05-03 15:18:02 (GMT)
commitc1964e9e2177eabe821f3e4243be8b99e0d2d542 (patch)
tree7390706509d540575ca8d89c9d3c7d0973e20165
parent4461d704e23a13dfbe78ea3020e4cbeff4b68dc2 (diff)
downloadcpython-c1964e9e2177eabe821f3e4243be8b99e0d2d542.zip
cpython-c1964e9e2177eabe821f3e4243be8b99e0d2d542.tar.gz
cpython-c1964e9e2177eabe821f3e4243be8b99e0d2d542.tar.bz2
bpo-36613: call remove_done_callback if exception (GH-12800)
Call remove_done_callback() in finally block. https://bugs.python.org/issue36613
-rw-r--r--Lib/asyncio/tasks.py3
-rw-r--r--Misc/NEWS.d/next/Library/2019-04-12-13-52-15.bpo-36613.hqT1qn.rst1
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index d850837..007a459 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -495,10 +495,11 @@ async def _wait(fs, timeout, return_when, loop):
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
new file mode 100644
index 0000000..8828dcc
--- /dev/null
+++ 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 \ No newline at end of file