diff options
| author | Christian Heimes <christian@python.org> | 2016-09-10 23:23:33 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2016-09-10 23:23:33 +0200 |
| commit | d04863771b0c5bedeb1e4afe05dcba3adcc0fb58 (patch) | |
| tree | fcd2630f24f426d5c1b084a9e16fe69ae4f5143a /Lib/ssl.py | |
| parent | 130bbe5fd3d0bd0c494078aff19a5f8108707b89 (diff) | |
| download | cpython-git-d04863771b0c5bedeb1e4afe05dcba3adcc0fb58.tar.gz | |
Issue #28022: Deprecate ssl-related arguments in favor of SSLContext.
The deprecation include manual creation of SSLSocket and certfile/keyfile
(or similar) in ftplib, httplib, imaplib, smtplib, poplib and urllib.
ssl.wrap_socket() is not marked as deprecated yet.
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py index 3400b7f3f0..f3da464986 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -1091,7 +1091,6 @@ def wrap_socket(sock, keyfile=None, certfile=None, do_handshake_on_connect=True, suppress_ragged_eofs=True, ciphers=None): - return SSLSocket(sock=sock, keyfile=keyfile, certfile=certfile, server_side=server_side, cert_reqs=cert_reqs, ssl_version=ssl_version, ca_certs=ca_certs, |