diff options
author | Yury Selivanov <yselivanov@sprymix.com> | 2015-11-17 12:20:26 -0500 |
---|---|---|
committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-11-17 12:20:26 -0500 |
commit | 4990289bbf6d51130855fd0a54c3726f60ee9fdf (patch) | |
tree | 90650af56f9495acf7ea19045e2e61d5eadfb45c /Lib/asyncio/tasks.py | |
parent | cfcc2bdcb2e721050fc0ddbdafd2f6452b845a24 (diff) | |
parent | 5498f2b6bf6d2ff7a1575a7a07ca1175f8226853 (diff) | |
download | cpython-git-4990289bbf6d51130855fd0a54c3726f60ee9fdf.tar.gz |
Merge 3.5
Diffstat (limited to 'Lib/asyncio/tasks.py')
-rw-r--r-- | Lib/asyncio/tasks.py | 3 |
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: |