summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-06-04 10:28:36 (GMT)
committerGeorg Brandl <georg@python.org>2009-06-04 10:28:36 (GMT)
commitf5123effa289c1ef8a2f5e8b3be554261ae42fbf (patch)
treeb9b4a9f929920e8750733170c70b13cc6a6815c7 /Doc/library
parentec8068891c83c983985cb65256ccb134b9ae643a (diff)
downloadcpython-f5123effa289c1ef8a2f5e8b3be554261ae42fbf.zip
cpython-f5123effa289c1ef8a2f5e8b3be554261ae42fbf.tar.gz
cpython-f5123effa289c1ef8a2f5e8b3be554261ae42fbf.tar.bz2
Merged revisions 73217 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73217 | georg.brandl | 2009-06-04 12:27:21 +0200 (Do, 04 Jun 2009) | 1 line #6175: document that inet_aton supports alternate input formats with less than three dots. ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/socket.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 6cb8f17..f896b43 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -381,6 +381,9 @@ The module :mod:`socket` exports the following constants and functions:
library and needs objects of type :ctype:`struct in_addr`, which is the C type
for the 32-bit packed binary this function returns.
+ :func:`inet_aton` also accepts strings with less than three dots; see the
+ Unix manual page :manpage:`inet(3)` for details.
+
If the IPv4 address string passed to this function is invalid,
:exc:`socket.error` will be raised. Note that exactly what is valid depends on
the underlying C implementation of :cfunc:`inet_aton`.