traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Georg Brandl 2009-05-04 20:50:30 +00:00
parent 9460648547
commit 5f25972a05
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Doc/library/socket.rst
View File

@ -385,7 +385,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 :exc:`socket.error` will be raised. Note that exactly what is valid depends on
the underlying C implementation of :cfunc:`inet_aton`. 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. instead for IPv4/v6 dual stack support.
@ -400,7 +400,7 @@ The module :mod:`socket` exports the following constants and functions:
If the byte sequence passed to this function is not exactly 4 bytes in 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 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. stack support.
@ -419,6 +419,11 @@ The module :mod:`socket` exports the following constants and functions:
Availability: Unix (maybe not all platforms). 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) .. function:: inet_ntop(address_family, packed_ip)