diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-03 03:28:29 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-03 03:28:29 (GMT) |
| commit | b4066374db45af2927eb5cde68f9b030eaec1b96 (patch) | |
| tree | 1c09a2cc471c099ab2e1cbd8d4d29d30a38b3276 /Doc/library/http.client.rst | |
| parent | 91ae4a1404fabc236a835cd5dd058f7e6b32062b (diff) | |
| download | cpython-b4066374db45af2927eb5cde68f9b030eaec1b96.zip cpython-b4066374db45af2927eb5cde68f9b030eaec1b96.tar.gz cpython-b4066374db45af2927eb5cde68f9b030eaec1b96.tar.bz2 | |
Merged revisions 77263-77264 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77263 | gregory.p.smith | 2010-01-02 17:29:44 -0800 (Sat, 02 Jan 2010) | 4 lines
Adds an optional source_address parameter to socket.create_connection().
For use by issue3972.
........
r77264 | gregory.p.smith | 2010-01-02 18:06:07 -0800 (Sat, 02 Jan 2010) | 5 lines
issue3972: HTTPConnection and HTTPSConnection now support a
source_address parameter.
Also cleans up an annotation in the socket documentation.
........
Diffstat (limited to 'Doc/library/http.client.rst')
| -rw-r--r-- | Doc/library/http.client.rst | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index 7a6717b..9f906df 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -23,7 +23,7 @@ HTTPS protocols. It is normally not used directly --- the module The module provides the following classes: -.. class:: HTTPConnection(host, port=None, strict=None[, timeout]) +.. class:: HTTPConnection(host, port=None, strict=None[, timeout[, source_address]]) An :class:`HTTPConnection` instance represents one transaction with an HTTP server. It should be instantiated passing it a host and optional port @@ -35,6 +35,8 @@ The module provides the following classes: 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, the global default timeout setting is used). + The optional *source_address* parameter may be a typle of a (host, port) + to use as the source address the HTTP connection is made from. For example, the following calls all create instances that connect to the server at the same host and port:: @@ -44,8 +46,11 @@ The module provides the following classes: >>> h3 = http.client.HTTPConnection('www.cwi.nl', 80) >>> h3 = http.client.HTTPConnection('www.cwi.nl', 80, timeout=10) + .. versionchanged:: 3.2 + *source_address* was added. -.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None, strict=None[, timeout]) + +.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None, strict=None[, timeout[, source_address]]) A subclass of :class:`HTTPConnection` that uses SSL for communication with secure servers. Default port is ``443``. *key_file* is the name of a PEM @@ -56,6 +61,9 @@ The module provides the following classes: This does not do any certificate verification. + .. versionchanged:: 3.2 + *source_address* was added. + .. class:: HTTPResponse(sock, debuglevel=0, strict=0, method=None, url=None) |