Merge 3.4

This commit is contained in:
Yury Selivanov 2015-08-02 10:24:49 -04:00
commit 32ba405ce5

View file

@ -249,8 +249,7 @@ class Task(futures.Future):
result._blocking = False result._blocking = False
result.add_done_callback(self._wakeup) result.add_done_callback(self._wakeup)
self._fut_waiter = result self._fut_waiter = result
if self._must_cancel: if self._must_cancel and self._fut_waiter.cancel():
if self._fut_waiter.cancel():
self._must_cancel = False self._must_cancel = False
else: else:
self._loop.call_soon( self._loop.call_soon(