diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 16:41:05 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 16:41:05 (GMT) |
| commit | 7b58a2bb1d904850293694b01de3bd21344d0ff2 (patch) | |
| tree | 65f199e66392a6e1f3e1a12c1ac95e66ca8c3f57 /Doc/library/asyncio-eventloop.rst | |
| parent | 04ce06b6129eb0acb0b45f48fd239ce60c44ecf8 (diff) | |
| parent | 5e4a7d8dc7781a4c0dfacecdc4db0eb34beb1391 (diff) | |
| download | cpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.zip cpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.tar.gz cpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Doc/library/asyncio-eventloop.rst')
| -rw-r--r-- | Doc/library/asyncio-eventloop.rst | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 889c8e2..0792a83 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -333,9 +333,12 @@ Creating listening connections Parameters: - * If *host* is an empty string or ``None``, all interfaces are assumed - and a list of multiple sockets will be returned (most likely - one for IPv4 and another one for IPv6). + * The *host* parameter can be a string, in that case the TCP server is + bound to *host* and *port*. The *host* parameter can also be a sequence + of strings and in that case the TCP server is bound to all hosts of the + sequence. If *host* is an empty string or ``None``, all interfaces are + assumed and a list of multiple sockets will be returned (most likely one + for IPv4 and another one for IPv6). * *family* can be set to either :data:`socket.AF_INET` or :data:`~socket.AF_INET6` to force the socket to use IPv4 or IPv6. If not set @@ -369,6 +372,10 @@ Creating listening connections The function :func:`start_server` creates a (:class:`StreamReader`, :class:`StreamWriter`) pair and calls back a function with this pair. + .. versionchanged:: 3.5.1 + + The *host* parameter can now be a sequence of strings. + .. coroutinemethod:: BaseEventLoop.create_unix_server(protocol_factory, path=None, \*, sock=None, backlog=100, ssl=None) |