diff options
| author | Ned Deily <nad@acm.org> | 2015-06-02 01:55:45 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-06-02 01:55:45 (GMT) |
| commit | 3e4f976965b24ad1e84d1e1c6b5224d081f65165 (patch) | |
| tree | 5014c4fd239417d9e09b4145164a2d731894543f /Doc/library/socket.rst | |
| parent | d8cf382ee70c9cf4fb71979352a70133a2ad9cb2 (diff) | |
| parent | 1b79e2d7eec86c67defdb40015c29d7cd25273c8 (diff) | |
| download | cpython-3e4f976965b24ad1e84d1e1c6b5224d081f65165.zip cpython-3e4f976965b24ad1e84d1e1c6b5224d081f65165.tar.gz cpython-3e4f976965b24ad1e84d1e1c6b5224d081f65165.tar.bz2 | |
Issue #24357: merge from 3.4
Diffstat (limited to 'Doc/library/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index a9f2fd3..8fbfcb0 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -478,12 +478,14 @@ The :mod:`socket` module also offers various network-related services: method. The following example fetches address information for a hypothetical TCP - connection to ``www.python.org`` on port 80 (results may differ on your + connection to ``google.com` on port 80 (results may differ on your system if IPv6 isn't enabled):: - >>> socket.getaddrinfo("www.python.org", 80, proto=socket.IPPROTO_TCP) - [(2, 1, 6, '', ('82.94.164.162', 80)), - (10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))] + >>> socket.getaddrinfo("google.com", 80, proto=socket.IPPROTO_TCP) + [(<AddressFamily.AF_INET6: 10>, <SocketType.SOCK_STREAM: 1>, + 6, '', ('2607:f8b0:4005:803::200e', 80, 0, 0)), + (<AddressFamily.AF_INET: 2>, <SocketType.SOCK_STREAM: 1>, + 6, '', ('216.58.192.46', 80))] .. versionchanged:: 3.2 parameters can now be passed using keyword arguments. |