Use always_abort=True to slightly simplify wait_all_tasks_blocked

python-trio · Jul 30, 2018 · 3bf8564 · 3bf8564
1 parent 6553bbc
commit 3bf8564
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/trio/_core/_run.py b/trio/_core/_run.py
@@ -1090,7 +1090,7 @@ def abort(_):
             del self.waiting_for_idle[key]
             return Abort.SUCCEEDED
 
-        await wait_task_rescheduled(abort)
+        await wait_task_rescheduled(abort, always_abort=True)
 
     ################
     # Instrumentation
@@ -1340,7 +1340,6 @@ def run_impl(runner, async_fn, args):
             while runner.waiting_for_idle:
                 key, task = runner.waiting_for_idle.peekitem(0)
                 if key[:2] == (cushion, tiebreaker):
-                    del runner.waiting_for_idle[key]
                     runner.reschedule(task)
                 else:
                     break