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 /Doc/library/ssl.rst | |
| 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 'Doc/library/ssl.rst')
| -rw-r--r-- | Doc/library/ssl.rst | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 98008fa..af0c5ab 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -230,7 +230,6 @@ instead. .. versionchanged:: 3.2 New optional argument *ciphers*. - Context creation ^^^^^^^^^^^^^^^^ @@ -925,7 +924,7 @@ SSL Sockets :ref:`notes on non-blocking sockets <ssl-nonblocking>`. Usually, :class:`SSLSocket` are not created directly, but using the - :func:`wrap_socket` function or the :meth:`SSLContext.wrap_socket` method. + the :meth:`SSLContext.wrap_socket` method. .. versionchanged:: 3.5 The :meth:`sendfile` method was added. @@ -935,6 +934,10 @@ SSL Sockets are received or sent. The socket timeout is now to maximum total duration of the shutdown. + .. deprecated:: 3.6 + It is deprecated to create a :class:`SSLSocket` instance directly, use + :meth:`SSLContext.wrap_socket` to wrap a socket. + SSL sockets also have the following additional methods and attributes: @@ -955,6 +958,9 @@ SSL sockets also have the following additional methods and attributes: The socket timeout is now to maximum total duration to read up to *len* bytes. + .. deprecated:: 3.6 + Use :meth:`~SSLSocket.recv` instead of :meth:`~SSLSocket.read`. + .. method:: SSLSocket.write(buf) Write *buf* to the SSL socket and return the number of bytes written. The @@ -970,6 +976,9 @@ SSL sockets also have the following additional methods and attributes: The socket timeout is no more reset each time bytes are received or sent. The socket timeout is now to maximum total duration to write *buf*. + .. deprecated:: 3.6 + Use :meth:`~SSLSocket.send` instead of :meth:`~SSLSocket.write`. + .. note:: The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the |