From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 19 Mar 2013 08:22:56 +0000 (-0700)
Subject: #17460 - merge from 3.3
X-Git-Tag: v3.4.0a1~1163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aced69fd3f210099a31a951d6ac6440c95a76630;p=python

#17460 - merge from 3.3
---

aced69fd3f210099a31a951d6ac6440c95a76630
diff --cc Doc/library/http.client.rst
index c4c76172b4,8137573aa8..0fad566da8
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@@ -51,9 -51,13 +51,13 @@@ The module provides the following class
     .. 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)
  
@@@ -85,12 -89,20 +89,20 @@@
        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: