commit ca5e908c6ed5df85571f2cfe2a27533a780bfbe3
author Ezio Melotti <ezio.melotti@gmail.com> Sun Aug 14 08:27:36 2011 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Sun Aug 14 08:27:36 2011 +0300
tree 98aadb87663f13ac37f3368ddb579a6daa3d6e30
parent 92be113ba9f588bc6e73a89c192f2172a6c9c2f5

#12725: fix working. Patch by Ben Hayden.

Doc/ACKS.txt

diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index 1e44cf7..246816c 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -77,6 +77,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 d6b1e4c..c5010bb 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -488,7 +488,7 @@
 
 .. 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``.
 
@@ -497,7 +497,7 @@
 
 .. function:: setdefaulttimeout(timeout)
 
-   Set the default timeout in floating seconds for new socket objects. A value of
+   Set 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``.
 
@@ -766,7 +766,7 @@
 
 .. method:: socket.gettimeout()
 
-   Return the timeout in floating seconds associated with socket operations, or
+   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 76d860c..694259b 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1784,7 +1784,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.");
 
@@ -4252,7 +4252,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.");
 
@@ -4282,7 +4282,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.");