merge with 3.4

95517e4a · Georg Brandl · 96d83683 · 2b07b0e8 · 95517e4a
Kaydet (Commit) 95517e4a authored Eki 28, 2014 tarafından Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

socket.rst Doc/library/socket.rst +1 -1

No files found.
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -466,7 +466,7 @@ The :mod:`socket` module also offers various network-related services:
   connection to ``www.python.org`` on port 80 (results may differ on your
   system if IPv6 isn't enabled)::

-      >>> socket.getaddrinfo("www.python.org", 80, proto=socket.SOL_TCP)
+      >>> 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))]