diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2002-06-06 22:24:10 (GMT) |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2002-06-06 22:24:10 (GMT) |
commit | bdbd84fdac0a28e8d2cbaff07cd64eef9a26c068 (patch) | |
tree | 313439c3b0b03a5b41132d79085b3b21b0f2aff9 | |
parent | 1a06fb0605cc7c15454ad95c6179c636c4490b90 (diff) | |
download | cpython-bdbd84fdac0a28e8d2cbaff07cd64eef9a26c068.zip cpython-bdbd84fdac0a28e8d2cbaff07cd64eef9a26c068.tar.gz cpython-bdbd84fdac0a28e8d2cbaff07cd64eef9a26c068.tar.bz2 |
Add version info, and fix another typo and wording spotted by /F. I think this is what he meant. :-)
-rw-r--r-- | Doc/lib/libsocket.tex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex index bb1fca7..9589cbe 100644 --- a/Doc/lib/libsocket.tex +++ b/Doc/lib/libsocket.tex @@ -520,17 +520,19 @@ value or \code{None}. Socket operations will raise an \exception{error} exception if the timeout period \var{value} has elapsed before the operation has completed. Setting a timeout of \code{None} disables timeouts on socket operations. +\versionadded{2.3} \end{methoddesc} \begin{methoddesc}[socket]{gettimeout}{} Returns the timeout in floating seconds associated with socket operations. A timeout of \code{None} indicates that timeouts on socket operations are disabled. +\versionadded{2.3} \end{methoddesc} Some notes on the interaction between socket blocking and timeouts: -socket blocking mode takes precedence over timeouts. If a socket if -set to non-blocking mode, then timeouts set on sockets are not used. +socket blocking mode takes precedence over timeouts. If a socket is +set to non-blocking mode, then timeouts are not used. The timeout value associated with the socket can still be set using \method{settimeout()} and its value retrieved using \method{gettimeout()}, but the timeout is never enforced (an exception |