Merge 3.5

2015-08-02 10:25:06 -04:00 · 2015-08-02 10:25:06 -04:00 · 68669d57d6
parent 96860ee8d0 32ba405ce5
commit 68669d57d6
1 changed files with 2 additions and 3 deletions
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@ -249,8 +249,7 @@ class Task(futures.Future):
                    result._blocking = False
                    result.add_done_callback(self._wakeup)
                    self._fut_waiter = result
-                    if self._must_cancel:
-                        if self._fut_waiter.cancel():
+                    if self._must_cancel and self._fut_waiter.cancel():
                        self._must_cancel = False
                else:
                    self._loop.call_soon(