From: Georg Brandl <georg@python.org>
Date: Sun, 25 Apr 2010 10:57:15 +0000 (+0000)
Subject: Patch from Tim Hatch: Make socket setblocking <-> settimeout examples symmetric.
X-Git-Tag: v2.7b2~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adbcf1f4a804b1a1497fd33ee2c4c28d264197aa;p=thirdparty%2FPython%2Fcpython.git

Patch from Tim Hatch: Make socket setblocking <-> settimeout examples symmetric.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 6c7cffcd1b11..2de867d4daa3 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)``.