[Python-checkins] peps: PEP 493: make word order consistent

Fri Nov 27 02:46:45 EST 2015

https://hg.python.org/peps/rev/3cf229a9457a
changeset: 6133:3cf229a9457a
user: Nick Coghlan <ncoghlan at gmail.com>
date: Fri Nov 27 17:46:37 2015 +1000
summary:
 PEP 493: make word order consistent
files:
 pep-0493.txt | 16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pep-0493.txt b/pep-0493.txt
--- a/pep-0493.txt
+++ b/pep-0493.txt
@@ -128,7 +128,7 @@
 ==========================
 
 This change is proposed for inclusion in CPython 2.7.12 and later CPython 2.7.x
-releases. It consists of a new ``ssl._verify_https_certificates()`` to specify
+releases. It consists of a new ``ssl._https_verify_certificates()`` to specify
 the default handling of HTTPS certificates in standard library client libraries.
 
 It is not proposed to forward port this change to Python 3, so Python 3
@@ -139,14 +139,14 @@
 -----------------
 
 The marker attribute on the ``ssl`` module related to this feature is the
-``ssl._verify_https_certificates`` function itself.
+``ssl._https_verify_certificates`` function itself.
 
 Specification
 -------------
 
-The ``ssl._verify_https_certificates`` function will work as follows::
+The ``ssl._https_verify_certificates`` function will work as follows::
 
- def _verify_https_certificates(enable=True):
+ def _https_verify_certificates(enable=True):
 """Verify server HTTPS certificates by default?"""
 global _create_default_https_context
 if enable:
@@ -166,11 +166,11 @@
 The inclusion of this feature will allow security sensitive applications to
 include the following forward-compatible snippet in their code::
 
- if hasattr(ssl, "_verify_https_certificates"):
- ssl._verify_https_certificates()
+ if hasattr(ssl, "_https_verify_certificates"):
+ ssl._https_verify_certificates()
 
 Some developers may also choose to opt out of certificate checking using
-``ssl._verify_https_certificates(enable=False)``. This doesn't introduce any
+``ssl._https_verify_certificates(enable=False)``. This doesn't introduce any
 major new security concerns, as monkeypatching the affected internal APIs was
 already possible.
 
@@ -449,7 +449,7 @@
 -----------------
 
 There's no specific attribute indicating that this situation applies. Rather,
-it is indicated by the ``ssl._verify_https_certificates`` and
+it is indicated by the ``ssl._https_verify_certificates`` and
 ``ssl._https_verify_envvar`` attributes being present in a Python version that
 is nominally older than Python 2.7.9.
 
-- 
Repository URL: https://hg.python.org/peps
