commit 388c945e9735864bb75f10ecfa22528c91b6a56c
author Ezio Melotti <ezio.melotti@gmail.com> Sun Aug 14 08:28:57 2011 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Sun Aug 14 08:28:57 2011 +0300
tree 694f5cc12b889c14b38fc0fe7aa03275d1b27acf
parent 3abb372c810c13af4207124c175cfd0a842b5f56

#12725: fix working. Patch by Ben Hayden.

Doc/ACKS.txt

diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index 271ece9..4f7e833 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -79,6 +79,7 @@
    * Travis B. Hartwell
    * Tim Hatch
    * Janko Hauser
+   * Ben Hayden
    * Thomas Heller
    * Bernhard Herzog
    * Magnus L. Hetland

Doc/library/socket.rst

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 14cd4ff..d462bb7 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -513,14 +513,14 @@
 
 .. function:: getdefaulttimeout()
 
-   Return the default timeout in floating seconds for new socket objects. A value
+   Return the default timeout in seconds (float) for new socket objects. A value
    of ``None`` indicates that new socket objects have no timeout. When the socket
    module is first imported, the default is ``None``.
 
 
 .. function:: setdefaulttimeout(timeout)
 
-   Set the default timeout in floating seconds for new socket objects.  When
+   Set the default timeout in seconds (float) for new socket objects.  When
    the socket module is first imported, the default is ``None``.  See
    :meth:`~socket.settimeout` for possible values and their respective
    meanings.
@@ -632,7 +632,7 @@
 
 .. method:: socket.gettimeout()
 
-   Return the timeout in floating seconds associated with socket operations,
+   Return the timeout in seconds (float) associated with socket operations,
    or ``None`` if no timeout is set.  This reflects the last call to
    :meth:`setblocking` or :meth:`settimeout`.
 

Modules/socketmodule.c

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index bc11b23..fcdbf8a 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1808,7 +1808,7 @@
 PyDoc_STRVAR(gettimeout_doc,
 "gettimeout() -> timeout\n\
 \n\
-Returns the timeout in floating seconds associated with socket \n\
+Returns the timeout in seconds (float) associated with socket \n\
 operations. A timeout of None indicates that timeouts on socket \n\
 operations are disabled.");
 
@@ -4201,7 +4201,7 @@
 PyDoc_STRVAR(getdefaulttimeout_doc,
 "getdefaulttimeout() -> timeout\n\
 \n\
-Returns the default timeout in floating seconds for new socket objects.\n\
+Returns the default timeout in seconds (float) for new socket objects.\n\
 A value of None indicates that new socket objects have no timeout.\n\
 When the socket module is first imported, the default is None.");
 
@@ -4231,7 +4231,7 @@
 PyDoc_STRVAR(setdefaulttimeout_doc,
 "setdefaulttimeout(timeout)\n\
 \n\
-Set the default timeout in floating seconds for new socket objects.\n\
+Set the default timeout in seconds (float) for new socket objects.\n\
 A value of None indicates that new socket objects have no timeout.\n\
 When the socket module is first imported, the default is None.");