[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/1d44d4addc17
changeset:   97208:1d44d4addc17
parent:      97205:e340fe83c510
parent:      97207:1f81c9ab44b1
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Sun Aug 02 10:25:06 2015 -0400
summary:
  Merge 3.5

files:
  Lib/asyncio/tasks.py |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -249,9 +249,8 @@
                     result._blocking = False
                     result.add_done_callback(self._wakeup)
                     self._fut_waiter = result
-                    if self._must_cancel:
-                        if self._fut_waiter.cancel():
-                            self._must_cancel = False
+                    if self._must_cancel and self._fut_waiter.cancel():
+                        self._must_cancel = False
                 else:
                     self._loop.call_soon(
                         self._step, None,

-- 
Repository URL: https://hg.python.org/cpython