[Python-checkins] cpython (merge 3.4 -> default): Fix duplicate doc entry for SSLContext.get_ca_certs()

[antoine.pitrou]

https://hg.python.org/cpython/rev/d7352db81b50
changeset:   95597:d7352db81b50
parent:      95595:0f944e424d67
parent:      95596:d88b5469fdd3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Apr 13 21:06:51 2015 +0200
summary:
  Fix duplicate doc entry for SSLContext.get_ca_certs()

(closes #18147)

files:
  Doc/library/ssl.rst |  16 ++++------------
  1 files changed, 4 insertions(+), 12 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1195,6 +1195,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.
+
    .. versionadded:: 3.4
 
 .. method:: SSLContext.set_default_verify_paths()
@@ -1375,18 +1379,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.
-
-   .. versionadded:: 3.4
-
 .. attribute:: SSLContext.check_hostname
 
    Wether to match the peer cert's hostname with :func:`match_hostname` in

-- 
Repository URL: https://hg.python.org/cpython