summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-05-04 20:49:17 (GMT)
committerGeorg Brandl <georg@python.org>2009-05-04 20:49:17 (GMT)
commite3a3726b3d647a4d20671f6029c05a404af83c56 (patch)
tree1049710d4a18ded8ef06bb6626954a6936db92dd /Doc
parentf5f045e4708d671c7d67934006c10e374c6dc5a1 (diff)
downloadcpython-e3a3726b3d647a4d20671f6029c05a404af83c56.zip
cpython-e3a3726b3d647a4d20671f6029c05a404af83c56.tar.gz
cpython-e3a3726b3d647a4d20671f6029c05a404af83c56.tar.bz2
#5916, 5917: small socket doc improvements.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/socket.rst9
1 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 37ef4a5..d1b107e 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -405,7 +405,7 @@ The module :mod:`socket` exports the following constants and functions:
:exc:`socket.error` will be raised. Note that exactly what is valid depends on
the underlying C implementation of :cfunc:`inet_aton`.
- :func:`inet_aton` does not support IPv6, and :func:`getnameinfo` should be used
+ :func:`inet_aton` does not support IPv6, and :func:`inet_pton` should be used
instead for IPv4/v6 dual stack support.
@@ -419,7 +419,7 @@ The module :mod:`socket` exports the following constants and functions:
If the string passed to this function is not exactly 4 bytes in length,
:exc:`socket.error` will be raised. :func:`inet_ntoa` does not support IPv6, and
- :func:`getnameinfo` should be used instead for IPv4/v6 dual stack support.
+ :func:`inet_ntop` should be used instead for IPv4/v6 dual stack support.
.. function:: inet_pton(address_family, ip_string)
@@ -437,6 +437,11 @@ The module :mod:`socket` exports the following constants and functions:
Availability: Unix (maybe not all platforms).
+ .. seealso::
+
+ :func:`ipaddr.BaseIP.packed`
+ Platform-independent conversion to a packed, binary format.
+
.. versionadded:: 2.3