traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.5

This commit is contained in:
Yury Selivanov 2015-08-02 10:25:06 -04:00
parent 96860ee8d0 32ba405ce5
commit 68669d57d6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/asyncio/tasks.py
View File

@ -249,9 +249,8 @@ 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():
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,