[Python-checkins] cpython: asyncio: wait_for() now accepts None as timeout (Victor Stinner).

Wed Jan 29 23:41:59 CET 2014

http://hg.python.org/cpython/rev/999c60a8c01b
changeset: 88825:999c60a8c01b
user: Guido van Rossum <guido at python.org>
date: Wed Jan 29 14:30:38 2014 -0800
summary:
 asyncio: wait_for() now accepts None as timeout (Victor Stinner).
files:
 Lib/asyncio/tasks.py | 3 +++
 Lib/test/test_asyncio/test_tasks.py | 11 +++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -394,6 +394,9 @@
 if loop is None:
 loop = events.get_event_loop()
 
+ if timeout is None:
+ return (yield from fut)
+
 waiter = futures.Future(loop=loop)
 timeout_handle = loop.call_later(timeout, _release_waiter, waiter, False)
 cb = functools.partial(_release_waiter, waiter, True)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -380,6 +380,17 @@
 self.assertEqual(foo_running, False)
 
 
+ def test_wait_for_blocking(self):
+ loop = test_utils.TestLoop()
+ self.addCleanup(loop.close)
+
+ @asyncio.coroutine
+ def coro():
+ return 'done'
+
+ res = loop.run_until_complete(asyncio.wait_for(coro(), timeout=None, loop=loop))
+ self.assertEqual(res, 'done')
+
 def test_wait_for_with_global_loop(self):
 
 def gen():
-- 
Repository URL: http://hg.python.org/cpython
