cpython: dfe6f0a603d2 (original) (raw)

Mercurial > cpython

changeset 71863:dfe6f0a603d2 2.7

#12725: fix working. Patch by Ben Hayden. [#12725]

Ezio Melotti ezio.melotti@gmail.com
date	Sun, 14 Aug 2011 08:27:36 +0300
parents	70ace8ffa4ac
children	eab17979a586
files	Doc/ACKS.txt Doc/library/socket.rst Modules/socketmodule.c
diffstat	3 files changed, 7 insertions(+), 6 deletions(-)[+] [-] Doc/ACKS.txt 1 Doc/library/socket.rst 6 Modules/socketmodule.c 6

line wrap: on

line diff

--- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -77,6 +77,7 @@ docs@python.org), and we'll be glad to c * Travis B. Hartwell * Tim Hatch * Janko Hauser

- Ben Hayden
- Thomas Heller
- Bernhard Herzog
- Magnus L. Hetland

--- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -488,7 +488,7 @@ The module :mod:socket exports the fol .. 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 @@ The module :mod:socket exports the fol .. 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 @@ correspond to Unix system calls applicab .. 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.

--- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1784,7 +1784,7 @@ sock_gettimeout(PySocketSockObject *s) PyDoc_STRVAR(gettimeout_doc, "gettimeout() -> timeout\n[](#l3.5) \n[](#l3.6) -Returns the timeout in floating seconds associated with socket \n[](#l3.7) +Returns the timeout in seconds (float) associated with socket \n[](#l3.8) operations. A timeout of None indicates that timeouts on socket \n[](#l3.9) operations are disabled."); @@ -4252,7 +4252,7 @@ socket_getdefaulttimeout(PyObject *self) PyDoc_STRVAR(getdefaulttimeout_doc, "getdefaulttimeout() -> timeout\n[](#l3.14) \n[](#l3.15) -Returns the default timeout in floating seconds for new socket objects.\n[](#l3.16) +Returns the default timeout in seconds (float) for new socket objects.\n[](#l3.17) A value of None indicates that new socket objects have no timeout.\n[](#l3.18) When the socket module is first imported, the default is None."); @@ -4282,7 +4282,7 @@ socket_setdefaulttimeout(PyObject *self, PyDoc_STRVAR(setdefaulttimeout_doc, "setdefaulttimeout(timeout)\n[](#l3.23) \n[](#l3.24) -Set the default timeout in floating seconds for new socket objects.\n[](#l3.25) +Set the default timeout in seconds (float) for new socket objects.\n[](#l3.26) A value of None indicates that new socket objects have no timeout.\n[](#l3.27) When the socket module is first imported, the default is None.");