wait_for() now accepts None as timeout

vstinner · vstinner · commit 6681086fed63 · 2014-01-28T23:59:56.000+01:00
diff --git a/asyncio/tasks.py b/asyncio/tasks.py
@@ -394,11 +394,14 @@ def wait_for(fut, timeout, *, loop=None):
     if loop is None:
         loop = events.get_event_loop()
 
+    fut = async(fut, loop=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)
 
-    fut = async(fut, loop=loop)
     fut.add_done_callback(cb)
 
     try:
diff --git a/tests/test_tasks.py b/tests/test_tasks.py
@@ -380,6 +380,17 @@ def foo():
         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():
