summaryrefslogtreecommitdiffstats
path: root/Doc/library/httplib.rst
diff options
context:
space:
mode:
authorFacundo Batista <facundobatista@gmail.com>2008-05-29 16:39:26 (GMT)
committerFacundo Batista <facundobatista@gmail.com>2008-05-29 16:39:26 (GMT)
commit4f1b1ed975fe25170d00559e63f992c9bf8e9b8a (patch)
tree0f2a0434dc9ad0181633f649611e417aa4a6ea61 /Doc/library/httplib.rst
parentf18a70720542268586e271bbadab3fb0332b8a39 (diff)
downloadcpython-4f1b1ed975fe25170d00559e63f992c9bf8e9b8a.zip
cpython-4f1b1ed975fe25170d00559e63f992c9bf8e9b8a.tar.gz
cpython-4f1b1ed975fe25170d00559e63f992c9bf8e9b8a.tar.bz2
Fixed the semantic of timeout for socket.create_connection and
all the upper level libraries that use it, including urllib2. Added and fixed some tests, and changed docs correspondingly. Thanks to John J Lee for the patch and the pusing, :)
Diffstat (limited to 'Doc/library/httplib.rst')
-rw-r--r--Doc/library/httplib.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/httplib.rst b/Doc/library/httplib.rst
index ce6222b..4c87d17 100644
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -44,7 +44,7 @@ The module provides the following classes:
be raised if the status line can't be parsed as a valid HTTP/1.0 or 1.1
status line. If the optional *timeout* parameter is given, blocking
operations (like connection attempts) will timeout after that many seconds
- (if it is not given or ``None``, the global default timeout setting is used).
+ (if it is not given, the global default timeout setting is used).
For example, the following calls all create instances that connect to the server
at the same host and port::