diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 11:31:53 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 11:31:53 -0700 |
| commit | f587d4d9948b388a440c4b4ced069345ea0b05b1 (patch) | |
| tree | 78812ada9000f9b6ba505e0d9c7d16834fd46d4f /Doc/library/imaplib.rst | |
| parent | 5f0e3a42ecde1c7a70cc8f8bca9f968937631186 (diff) | |
| parent | 5cb4efc23896173e283b5ed627a68da2eb57130d (diff) | |
| download | cpython-f587d4d9948b388a440c4b4ced069345ea0b05b1.tar.gz | |
Merge from 3.2 . Replace the term members with correct and appropriate terminology. Initial patch by Adam Woodbeck.
Diffstat (limited to 'Doc/library/imaplib.rst')
| -rw-r--r-- | Doc/library/imaplib.rst | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst index 1d92fe5339..592e4b0f4b 100644 --- a/Doc/library/imaplib.rst +++ b/Doc/library/imaplib.rst @@ -64,14 +64,21 @@ Three exceptions are defined as attributes of the :class:`IMAP4` class: There's also a subclass for secure connections: -.. class:: IMAP4_SSL(host='', port=IMAP4_SSL_PORT, keyfile=None, certfile=None) +.. class:: IMAP4_SSL(host='', port=IMAP4_SSL_PORT, keyfile=None, certfile=None, ssl_context=None) This is a subclass derived from :class:`IMAP4` that connects over an SSL encrypted socket (to use this class you need a socket module that was compiled with SSL support). If *host* is not specified, ``''`` (the local host) is used. If *port* is omitted, the standard IMAP4-over-SSL port (993) is used. *keyfile* and *certfile* are also optional - they can contain a PEM formatted private key - and certificate chain file for the SSL connection. + and certificate chain file for the SSL connection. *ssl_context* parameter is a + :class:`ssl.SSLContext` object which allows bundling SSL configuration + options, certificates and private keys into a single (potentially long-lived) + structure. Note that the *keyfile*/*certfile* parameters are mutually exclusive with *ssl_context*, + a :class:`ValueError` is thrown if *keyfile*/*certfile* is provided along with *ssl_context*. + + .. versionchanged:: 3.3 + *ssl_context* parameter added. The second subclass allows for connections created by a child process: |