summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/futures.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-07-07 10:46:09 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-07-07 10:46:09 (GMT)
commit3bc13cc8b0b85f989b8da9c5718fc5319ad06248 (patch)
tree52fc5995a7cc1ccafce61ef403b7dea1a4ff342d /Lib/asyncio/futures.py
parent667abc7d42e87b87338981276d0eac9895d4abf4 (diff)
parente50dafcd636ba32db890600164698bb070d40d97 (diff)
downloadcpython-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.zip
cpython-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.tar.gz
cpython-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.tar.bz2
Merge heads
Diffstat (limited to 'Lib/asyncio/futures.py')
-rw-r--r--Lib/asyncio/futures.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index fcc90d1..022fef7 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -316,6 +316,12 @@ class Future:
# So-called internal methods (note: no set_running_or_notify_cancel()).
+ def _set_result_unless_cancelled(self, result):
+ """Helper setting the result only if the future was not cancelled."""
+ if self.cancelled():
+ return
+ self.set_result(result)
+
def set_result(self, result):
"""Mark the future done and set its result.