summaryrefslogtreecommitdiffstats
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-28 21:45:36 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-28 21:45:36 (GMT)
commit95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec (patch)
tree89ff39e86c8d69179d8b2a104324c869685cc226 /Doc/library/socket.rst
parent96d836833e4a5dc02d304d1e05df4741bdf38037 (diff)
parent2b07b0e8683b248b82d09bf1f0dbd3bd09e7af72 (diff)
downloadcpython-95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec.zip
cpython-95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec.tar.gz
cpython-95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r--Doc/library/socket.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 4fc222e..830e82d 100644
--- 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))]