summaryrefslogtreecommitdiffstats
path: root/Modules/socketmodule.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-08-14 05:29:49 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-08-14 05:29:49 (GMT)
commit7ec7fc4c3b67f77654b6964a37500d1421dc7f04 (patch)
treebc086cdab03c59a2eb2f527684cc6ed12c896543 /Modules/socketmodule.c
parent85674936c748379fb57c197ac01cdb1dde0431a5 (diff)
parent388c945e9735864bb75f10ecfa22528c91b6a56c (diff)
downloadcpython-7ec7fc4c3b67f77654b6964a37500d1421dc7f04.zip
cpython-7ec7fc4c3b67f77654b6964a37500d1421dc7f04.tar.gz
cpython-7ec7fc4c3b67f77654b6964a37500d1421dc7f04.tar.bz2
#12725: merge with 3.2.
Diffstat (limited to 'Modules/socketmodule.c')
-rw-r--r--Modules/socketmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ee3a511..8de84b7 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1822,7 +1822,7 @@ sock_gettimeout(PySocketSockObject *s)
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 @@ socket_getdefaulttimeout(PyObject *self)
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 @@ socket_setdefaulttimeout(PyObject *self, PyObject *arg)
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.");