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

Sun Aug 2 22:50:00 CEST 2015

https://hg.python.org/cpython/rev/14daad66c702
changeset: 97214:14daad66c702
branch: 3.5
parent: 97210:25ba5e7af08a
parent: 97213:e2b02585bb5a
user: Yury Selivanov <yselivanov at sprymix.com>
date: Sun Aug 02 16:49:44 2015 -0400
summary:
 Merge 3.4
files:
 Lib/asyncio/tasks.py | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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