diff options
| author | doko <doko@ubuntu.com> | 2017-01-31 13:35:26 +0100 |
|---|---|---|
| committer | doko <doko@ubuntu.com> | 2017-01-31 13:35:26 +0100 |
| commit | e0cb38ac4330d5e09b5e21c74c5d5e453af99a4f (patch) | |
| tree | a64fe56edb37bb84d4ffea1990c0ac124a6dba9d /Doc/library/poplib.rst | |
| parent | d7764ed2a9255ddb5bdb7d3f184610cdc7a66aad (diff) | |
| parent | 602663ac0effc2e8e3b615141babd95ed7691dda (diff) | |
| download | cpython-e0cb38ac4330d5e09b5e21c74c5d5e453af99a4f.tar.gz | |
merge 3.5
Diffstat (limited to 'Doc/library/poplib.rst')
| -rw-r--r-- | Doc/library/poplib.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst index ffabc32b6e..d72b660d6e 100644 --- a/Doc/library/poplib.rst +++ b/Doc/library/poplib.rst @@ -62,6 +62,13 @@ The :mod:`poplib` module provides two classes: :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :data:`ssl.HAS_SNI`). + .. deprecated:: 3.6 + + *keyfile* and *certfile* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + One exception is defined as an attribute of the :mod:`poplib` module: |