diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-05-26 18:06:04 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-05-26 18:06:04 (GMT) |
| commit | a67299e757b69660ec932e4da0a7dd4bfc680f08 (patch) | |
| tree | 8ed4df6f8163b832625b232b19c46ac12bd26899 /Doc | |
| parent | 60853211da1d3c450b6371ebfaedade04a908f21 (diff) | |
| download | cpython-a67299e757b69660ec932e4da0a7dd4bfc680f08.zip cpython-a67299e757b69660ec932e4da0a7dd4bfc680f08.tar.gz cpython-a67299e757b69660ec932e4da0a7dd4bfc680f08.tar.bz2 | |
Fix issue #8806: add SSL contexts support to ftplib
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/ftplib.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index 35e9ce2..e3e546c 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -65,7 +65,7 @@ The module defines the following items: Support for the :keyword:`with` statement was added. -.. class:: FTP_TLS(host='', user='', passwd='', acct='', [keyfile[, certfile[, timeout]]]) +.. class:: FTP_TLS(host='', user='', passwd='', acct='', [keyfile[, certfile[, context[, timeout]]]]) A :class:`FTP` subclass which adds TLS support to FTP as described in :rfc:`4217`. @@ -74,6 +74,9 @@ The module defines the following items: explicitly ask for it by calling the :meth:`prot_p` method. *keyfile* and *certfile* are optional -- they can contain a PEM formatted private key and certificate chain file name for the SSL connection. + *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. .. versionadded:: 3.2 |