From: Xiang Zhang <angwerzx@126.com>
Date: Fri, 23 Dec 2016 03:10:19 +0000 (+0800)
Subject: Issue #29038: Fix duplicate get_ca_certs() doc entry.
X-Git-Tag: v2.7.14rc1~324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4f91baa35d618653fecc91b55d5d6faf270d438;p=python

Issue #29038: Fix duplicate get_ca_certs() doc entry.
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 8849d0f3d7..8b41317eb2 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1124,6 +1124,10 @@ to speed up repeated connections from the same clients.
    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 @@ to speed up repeated connections from the same clients.
       >>> 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