diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-03-19 01:22:56 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-03-19 01:22:56 -0700 |
| commit | 7f989c26cf8120237b221a296cb4306fd9006868 (patch) | |
| tree | 810f66efb1e667de947d58e942941ffd89f9f30d /Doc/library/http.client.rst | |
| parent | c1353ff65c4f51c3a625072f3a6454e3e323ae68 (diff) | |
| parent | b2238a7cef2a0a0fa7efbc7907b91f0fe1db8cd0 (diff) | |
| download | cpython-7f989c26cf8120237b221a296cb4306fd9006868.tar.gz | |
#17460 - merge from 3.3
Diffstat (limited to 'Doc/library/http.client.rst')
| -rw-r--r-- | Doc/library/http.client.rst | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index 8137573aa8..0fad566da8 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -27,7 +27,7 @@ HTTPS protocols. It is normally not used directly --- the module The module provides the following classes: -.. class:: HTTPConnection(host, port=None[, strict][, timeout], \ +.. class:: HTTPConnection(host, port=None[, timeout], \ source_address=None) An :class:`HTTPConnection` instance represents one transaction with an HTTP @@ -51,13 +51,13 @@ The module provides the following classes: .. versionchanged:: 3.2 *source_address* was added. - .. deprecated-removed:: 3.2 3.4 - The *strict* parameter is deprecated. HTTP 0.9-style "Simple Responses" - are not supported anymore. + .. versionchanged:: 3.4 + The *strict* parameter is removed. HTTP 0.9-style "Simple Responses" are + not supported. .. class:: HTTPSConnection(host, port=None, key_file=None, \ - cert_file=None[, strict][, timeout], \ + cert_file=None[, timeout], \ source_address=None, *, context=None, \ check_hostname=None) @@ -89,19 +89,19 @@ The module provides the following classes: This class now supports HTTPS virtual hosts if possible (that is, if :data:`ssl.HAS_SNI` is true). - .. deprecated-removed:: 3.2 3.4 - The *strict* parameter is deprecated. HTTP 0.9-style "Simple Responses" - are not supported anymore. + .. versionchanged:: 3.4 + The *strict* parameter is removed. HTTP 0.9-style "Simple Responses" are + not supported anymore. -.. class:: HTTPResponse(sock, debuglevel=0[, strict], method=None, url=None) +.. class:: HTTPResponse(sock, debuglevel=0, method=None, url=None) Class whose instances are returned upon successful connection. Not instantiated directly by user. - .. deprecated-removed:: 3.2 3.4 - The *strict* parameter is deprecated. HTTP 0.9-style "Simple Responses" - are not supported anymore. + .. versionchanged:: 3.4 + The *strict* parameter is removed. HTTP 0.9 style "Simple Responses" are + not supported anymore. The following exceptions are raised as appropriate: |