From: Ned Deily <nad@acm.org>
Date: Tue, 2 Jun 2015 01:52:48 +0000 (-0700)
Subject: Issue #24357: Change host in socket.getaddrinfo example to one that
X-Git-Tag: v3.5.0b3~117^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b79e2d7eec86c67defdb40015c29d7cd25273c8;p=thirdparty%2FPython%2Fcpython.git

Issue #24357: Change host in socket.getaddrinfo example to one that
does support IPv6 and IPv4; www.python.org currently does not.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 8b5e871ffe9e..1a35c971433e 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -461,12 +461,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.