[Python-checkins] cpython (merge 3.5 -> default): Issue #24357: merge from 3.5

[ned.deily]

https://hg.python.org/cpython/rev/7c7b1fffafdf
changeset:   96457:7c7b1fffafdf
parent:      96453:6fcb64097b1c
parent:      96456:22b77f859521
user:        Ned Deily <nad at acm.org>
date:        Mon Jun 01 18:57:03 2015 -0700
summary:
  Issue #24357: merge from 3.5

files:
  Doc/library/socket.rst |  10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -478,12 +478,14 @@
    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.

-- 
Repository URL: https://hg.python.org/cpython