[Python-checkins] r54581 - in python/trunk: Doc/lib/libhttplib.tex Doc/lib/libsocket.tex Lib/httplib.py

[georg.brandl]

Author: georg.brandl
Date: Mon Mar 26 22:28:28 2007
New Revision: 54581

Modified:
   python/trunk/Doc/lib/libhttplib.tex
   python/trunk/Doc/lib/libsocket.tex
   python/trunk/Lib/httplib.py
Log:
Some nits.


Modified: python/trunk/Doc/lib/libhttplib.tex
==============================================================================
--- python/trunk/Doc/lib/libhttplib.tex	(original)
+++ python/trunk/Doc/lib/libhttplib.tex	Mon Mar 26 22:28:28 2007
@@ -32,12 +32,11 @@
 server.  It should be instantiated passing it a host and optional port number.
 If no port number is passed, the port is extracted from the host string if it
 has the form \code{\var{host}:\var{port}}, else the default HTTP port (80) is
-used.  
-When True the optional parameter \var{strict}
+used.  When True, the optional parameter \var{strict}
 causes \code{BadStatusLine} to be raised if the status line can't be parsed
 as a valid HTTP/1.0 or 1.1 status line.  If the optional \var{timeout}
 parameter is given, connection attempts will timeout after that many
-seconds (if no timeout is passed, or is passed as None, the global default 
+seconds (if it is not given or \code{None}, the global default 
 timeout setting is used).
 
 For example, the following calls all create instances that connect to

Modified: python/trunk/Doc/lib/libsocket.tex
==============================================================================
--- python/trunk/Doc/lib/libsocket.tex	(original)
+++ python/trunk/Doc/lib/libsocket.tex	Mon Mar 26 22:28:28 2007
@@ -171,12 +171,12 @@
 \end{datadesc}
 
 \begin{funcdesc}{create_connection}{address\optional{, timeout}}
-Connects to the \var{address} received (as usual, a pair host/port), with
-an optional timeout for the connection.  Specially useful for higher-level
-protocols, it is not normally used directly from application-level code.  
-Passing the optional \var{timeout} parameter will set the timeout on the 
-socket instance (if not present, or passed as None, the global default
-timeout setting is used).
+Connects to the \var{address} received (as usual, a \code{(host, port)}
+pair), with an optional timeout for the connection.  Specially useful for
+higher-level protocols, it is not normally used directly from
+application-level code.  Passing the optional \var{timeout} parameter
+will set the timeout on the socket instance (if it is not given or
+\code{None}, the global default timeout setting is used).
 \end{funcdesc}
 
 \begin{funcdesc}{getaddrinfo}{host, port\optional{, family\optional{,

Modified: python/trunk/Lib/httplib.py
==============================================================================
--- python/trunk/Lib/httplib.py	(original)
+++ python/trunk/Lib/httplib.py	Mon Mar 26 22:28:28 2007
@@ -659,7 +659,8 @@
 
     def connect(self):
         """Connect to the host and port specified in __init__."""
-        self.sock = socket.create_connection((self.host,self.port), self.timeout)
+        self.sock = socket.create_connection((self.host,self.port),
+                                             self.timeout)
 
     def close(self):
         """Close the connection to the HTTP server."""