Commit 511bf788 authored by Andrew Svetlov's avatar Andrew Svetlov

merge 3.5

parents 97558412 4ea31f5b
......@@ -744,7 +744,7 @@ def timeout(timeout, *, loop=None):
For example:
>>> with asyncio.timeout(0.001):
>>> yield from coro()
... yield from coro()
timeout: timeout value in seconds
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment