Mercurial > cpython-lru_cache-weakref
diff Doc/library/socket.rst @ 53750:310daa99d607
Merged revisions 72292 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72292 | georg.brandl | 2009-05-04 22:49:17 +0200 (Mo, 04 Mai 2009) | 1 line
#5916, 5917: small socket doc improvements.
........
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Mon, 04 May 2009 20:50:30 +0000 |
| parents | 8a292543e871 |
| children | ddb50c3b86f2 |
line wrap: on
line diff
--- a/Doc/library/socket.rst Mon May 04 20:46:44 2009 +0000 +++ b/Doc/library/socket.rst Mon May 04 20:50:30 2009 +0000 @@ -385,7 +385,7 @@ :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. @@ -400,7 +400,7 @@ If the byte sequence 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 + support IPv6, and :func:`inet_ntop` should be used instead for IPv4/v6 dual stack support. @@ -419,6 +419,11 @@ Availability: Unix (maybe not all platforms). + .. seealso:: + + :func:`ipaddr.BaseIP.packed` + Platform-independent conversion to a packed, binary format. + .. function:: inet_ntop(address_family, packed_ip)