diff options
| author | Christian Heimes <christian@python.org> | 2016-09-10 21:23:33 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2016-09-10 21:23:33 (GMT) |
| commit | d04863771b0c5bedeb1e4afe05dcba3adcc0fb58 (patch) | |
| tree | fcd2630f24f426d5c1b084a9e16fe69ae4f5143a /Lib/test/test_poplib.py | |
| parent | 130bbe5fd3d0bd0c494078aff19a5f8108707b89 (diff) | |
| download | cpython-d04863771b0c5bedeb1e4afe05dcba3adcc0fb58.zip cpython-d04863771b0c5bedeb1e4afe05dcba3adcc0fb58.tar.gz cpython-d04863771b0c5bedeb1e4afe05dcba3adcc0fb58.tar.bz2 | |
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/test/test_poplib.py')
| -rw-r--r-- | Lib/test/test_poplib.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py index 7b9606d..e5b16dc 100644 --- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -152,10 +152,12 @@ class DummyPOP3Handler(asynchat.async_chat): def cmd_stls(self, arg): if self.tls_active is False: self.push('+OK Begin TLS negotiation') - tls_sock = ssl.wrap_socket(self.socket, certfile=CERTFILE, - server_side=True, - do_handshake_on_connect=False, - suppress_ragged_eofs=False) + context = ssl.SSLContext() + context.load_cert_chain(CERTFILE) + tls_sock = context.wrap_socket(self.socket, + server_side=True, + do_handshake_on_connect=False, + suppress_ragged_eofs=False) self.del_channel() self.set_socket(tls_sock) self.tls_active = True |