summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-04-25 10:57:15 (GMT)
committerGeorg Brandl <georg@python.org>2010-04-25 10:57:15 (GMT)
commitadbcf1f4a804b1a1497fd33ee2c4c28d264197aa (patch)
tree49404a4960a7e9ccb870db30afdd4ec583a54c14
parent1e518258c95eacb00831c6ef408b1c61792c46cb (diff)
downloadcpython-adbcf1f4a804b1a1497fd33ee2c4c28d264197aa.zip
cpython-adbcf1f4a804b1a1497fd33ee2c4c28d264197aa.tar.gz
cpython-adbcf1f4a804b1a1497fd33ee2c4c28d264197aa.tar.bz2
Patch from Tim Hatch: Make socket setblocking <-> settimeout examples symmetric.
-rw-r--r--Doc/library/socket.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 6c7cffc..2de867d 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -714,7 +714,7 @@ correspond to Unix system calls applicable to sockets.
blocking mode. In non-blocking mode, if a :meth:`recv` call doesn't find any
data, or if a :meth:`send` call can't immediately dispose of the data, a
:exc:`error` exception is raised; in blocking mode, the calls block until they
- can proceed. ``s.setblocking(0)`` is equivalent to ``s.settimeout(0)``;
+ can proceed. ``s.setblocking(0)`` is equivalent to ``s.settimeout(0.0)``;
``s.setblocking(1)`` is equivalent to ``s.settimeout(None)``.