diff Modules/socketmodule.c @ 71865:49e9e34da512

#12725: merge with 3.2.
author Ezio Melotti <ezio.melotti@gmail.com>
date Sun, 14 Aug 2011 08:29:49 +0300
parents 940537b372e3 ab3432a81c26
children c64216addd7f
line wrap: on
line diff
--- a/Modules/socketmodule.c	Sun Aug 14 01:51:52 2011 +0200
+++ b/Modules/socketmodule.c	Sun Aug 14 08:29:49 2011 +0300
@@ -1822,7 +1822,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.");
 
@@ -4247,7 +4247,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.");
 
@@ -4277,7 +4277,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.");