commit c92bf83a829956e683a3d6bb1ae65aed74d7b92a
author Yury Selivanov <yury@magic.io> Sat Jun 11 12:00:07 2016 -0400
committer Yury Selivanov <yury@magic.io> Sat Jun 11 12:00:07 2016 -0400
tree fee9f36c8042a41f709a3916baabfa95d91ad1cb
parent ca2e0a48cf0dd663ba7457dc6bce60988cdfd56c

Issue #22970: asyncio: Fix inconsistency cancelling Condition.wait.

Patch by David Coles.

Lib/asyncio/locks.py

diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
index 842d621..741aaf2 100644
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -329,7 +329,13 @@
                 self._waiters.remove(fut)
 
         finally:
-            yield from self.acquire()
+            # Must reacquire lock even if wait is cancelled
+            while True:
+                try:
+                    yield from self.acquire()
+                    break
+                except futures.CancelledError:
+                    pass
 
     @coroutine
     def wait_for(self, predicate):