[Python-checkins] cpython (2.7): Issue #29038: Fix duplicate get_ca_certs() doc entry.

Thu Dec 22 22:15:16 EST 2016

https://hg.python.org/cpython/rev/94900abda1a5
changeset: 105787:94900abda1a5
branch: 2.7
user: Xiang Zhang <angwerzx at 126.com>
date: Fri Dec 23 11:10:19 2016 +0800
summary:
 Issue #29038: Fix duplicate get_ca_certs() doc entry.
files:
 Doc/library/ssl.rst | 14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1124,6 +1124,10 @@
 does not contain certificates from *capath* unless a certificate was
 requested and loaded by a SSL connection.
 
+ .. note::
+ Certificates in a capath directory aren't loaded unless they have
+ been used at least once.
+
 .. method:: SSLContext.set_default_verify_paths()
 
 Load a set of default "certification authority" (CA) certificates from
@@ -1287,16 +1291,6 @@
 >>> stats['hits'], stats['misses']
 (0, 0)
 
-.. method:: SSLContext.get_ca_certs(binary_form=False)
-
- Returns a list of dicts with information of loaded CA certs. If the
- optional argument is true, returns a DER-encoded copy of the CA
- certificate.
-
- .. note::
- Certificates in a capath directory aren't loaded unless they have
- been used at least once.
-
 .. attribute:: SSLContext.check_hostname
 
 Wether to match the peer cert's hostname with :func:`match_hostname` in
-- 
Repository URL: https://hg.python.org/cpython
