Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-28 22:45:36 +01:00
parent 96d836833e 2b07b0e868
commit 95517e4aee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/socket.rst
View File

@ -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 connection to ``www.python.org`` on port 80 (results may differ on your
system if IPv6 isn't enabled):: 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)), [(2, 1, 6, '', ('82.94.164.162', 80)),
(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))] (10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]