diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-08-14 05:28:57 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-08-14 05:28:57 (GMT) |
commit | f42121f27e34797b0b5db86ad2fdc4a72bc7e37a (patch) | |
tree | 24c62681433ade70d64aa58bda9715d9740a5dc0 /Doc/library | |
parent | 666ed0b84d68fcc2962d1857a227c5d458f1cd40 (diff) | |
download | cpython-f42121f27e34797b0b5db86ad2fdc4a72bc7e37a.zip cpython-f42121f27e34797b0b5db86ad2fdc4a72bc7e37a.tar.gz cpython-f42121f27e34797b0b5db86ad2fdc4a72bc7e37a.tar.bz2 |
#12725: fix working. Patch by Ben Hayden.
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/socket.rst | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ The module :mod:`socket` exports the following constants and functions: .. 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 @@ correspond to Unix system calls applicable to sockets. .. 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`. |