merge 3.4

This commit is contained in:
Andrew Svetlov 2016-01-11 12:25:40 +02:00
commit 4ea31f5b86

View file

@ -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