commit 70705e3cdfff6a2c1211456afce99afc3d9ca59b
author Łukasz Langa <lukasz@langa.pl> Tue May 23 00:36:23 2017 -0700
committer GitHub <noreply@github.com> Tue May 23 00:36:23 2017 -0700
tree 7f7c8a53039ea7a5257d18f405bd200f5dfe1a98
parent 762add7877258b62b38f0cff87159179faa471dc

[3.6] call remove_done_callback in finally section (GH-1688) (#1755)

(cherry picked from commit 21b3e04c13212b29e8c35ffc36eed8603fde08f4)

Lib/asyncio/base_events.py

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 0df58c5..a4967b8 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -459,7 +459,8 @@
                 # local task.
                 future.exception()
             raise
-        future.remove_done_callback(_run_until_complete_cb)
+        finally:
+            future.remove_done_callback(_run_until_complete_cb)
         if not future.done():
             raise RuntimeError('Event loop stopped before Future completed.')