summaryrefslogtreecommitdiff
path: root/Lib/asyncio/tasks.py
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-11-17 12:20:02 -0500
committerYury Selivanov <yselivanov@sprymix.com>2015-11-17 12:20:02 -0500
commit5498f2b6bf6d2ff7a1575a7a07ca1175f8226853 (patch)
tree245ec297bfdbf24c8ba15723f4b75fda468eb60a /Lib/asyncio/tasks.py
parent7f324ba735dff39b7209717b646d3c96acd49ccf (diff)
parent5d7e3b6cd208dffdfe8530664081b62e0c7e3092 (diff)
downloadcpython-git-5498f2b6bf6d2ff7a1575a7a07ca1175f8226853.tar.gz
Merge 3.4
Diffstat (limited to 'Lib/asyncio/tasks.py')
-rw-r--r--Lib/asyncio/tasks.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 61f0645f97..63cbcda32f 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -500,7 +500,8 @@ def sleep(delay, result=None, *, loop=None):
future = futures.Future(loop=loop)
h = future._loop.call_later(delay,
- future._set_result_unless_cancelled, result)
+ futures._set_result_unless_cancelled,
+ future, result)
try:
return (yield from future)
finally: