mirror of
https://github.com/python/cpython.git
synced 2025-11-03 03:22:27 +00:00
Add version info, and fix another typo and wording spotted by /F. I think this is what he meant. :-)
This commit is contained in:
parent
1a06fb0605
commit
bdbd84fdac
1 changed files with 4 additions and 2 deletions
|
|
@ -520,17 +520,19 @@ value or \code{None}. Socket operations will raise an
|
||||||
\exception{error} exception if the timeout period \var{value} has
|
\exception{error} exception if the timeout period \var{value} has
|
||||||
elapsed before the operation has completed. Setting a timeout of
|
elapsed before the operation has completed. Setting a timeout of
|
||||||
\code{None} disables timeouts on socket operations.
|
\code{None} disables timeouts on socket operations.
|
||||||
|
\versionadded{2.3}
|
||||||
\end{methoddesc}
|
\end{methoddesc}
|
||||||
|
|
||||||
\begin{methoddesc}[socket]{gettimeout}{}
|
\begin{methoddesc}[socket]{gettimeout}{}
|
||||||
Returns the timeout in floating seconds associated with socket
|
Returns the timeout in floating seconds associated with socket
|
||||||
operations. A timeout of \code{None} indicates that timeouts on
|
operations. A timeout of \code{None} indicates that timeouts on
|
||||||
socket operations are disabled.
|
socket operations are disabled.
|
||||||
|
\versionadded{2.3}
|
||||||
\end{methoddesc}
|
\end{methoddesc}
|
||||||
|
|
||||||
Some notes on the interaction between socket blocking and timeouts:
|
Some notes on the interaction between socket blocking and timeouts:
|
||||||
socket blocking mode takes precedence over timeouts. If a socket if
|
socket blocking mode takes precedence over timeouts. If a socket is
|
||||||
set to non-blocking mode, then timeouts set on sockets are not used.
|
set to non-blocking mode, then timeouts are not used.
|
||||||
The timeout value associated with the socket can still be set using
|
The timeout value associated with the socket can still be set using
|
||||||
\method{settimeout()} and its value retrieved using
|
\method{settimeout()} and its value retrieved using
|
||||||
\method{gettimeout()}, but the timeout is never enforced (an exception
|
\method{gettimeout()}, but the timeout is never enforced (an exception
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue