PEP 476: Updates based on Guido's feedback on python-dev

pep-0476.txt

@@ -111,19 +111,6 @@ certificates to system trust stores in order to trust them globally.
 Twisted's 14.0 release made this same change, and it has been met with almost
 no opposition.
 
-In order to make this transition as smooth as possible, the next 3.4.x release
-following this PEP will be modified to emit a warning in cases that would raise
-an Exception in Python 3.5.
-
-Warnings
---------
-
-To support this warning, in 3.4.next a new ``verify_mode`` is introduced
-``CERT_WARN``, which is equivilant to ``CERT_NONE``, except in cases that would
-fail as ``CERT_REQUIRED`` or fail the hostname check emits a warning. In
-3.4.next the ``httplib`` module will set this as the ``verify_mode`` if the
-default context is used.
-
 Other protocols
 ===============
 
@@ -142,10 +129,11 @@ for a potential similar PEP in the future:
 Python Versions
 ===============
 
-This PEP proposes making these changes to ``default`` (Python 3) branch. I
-strongly believe these changes also belong in Python 2, but doing them in a
-patch-release isn't reasonable, and there is strong opposition to doing a 2.8
-release.
+This PEP describes changes that will occur on both the 3.4.x, 3.5 and 2.7.X
+branches. For 2.7.X this will require backporting the ``context``
+(``SSLContext``) argument to ``httplib``, in addition to the features already
+backported in
+:pep:`466`.
 
 Copyright
 =========