[Python-checkins] r73218 - in python/branches/py3k: Doc/library/socket.rst

georg.brandl python-checkins at python.org
Thu Jun 4 12:28:36 CEST 2009


Author: georg.brandl
Date: Thu Jun  4 12:28:36 2009
New Revision: 73218

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/socket.rst

Modified: python/branches/py3k/Doc/library/socket.rst
==============================================================================
--- python/branches/py3k/Doc/library/socket.rst	(original)
+++ python/branches/py3k/Doc/library/socket.rst	Thu Jun  4 12:28:36 2009
@@ -381,6 +381,9 @@
    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`.


More information about the Python-checkins mailing list