[Python-checkins] [3.12] gh-94172: Update keyfile removal documentation (GH-105392) (#105402)
vstinner
webhook-mailer at python.org
Tue Jun 6 14:15:03 EDT 2023
https://github.com/python/cpython/commit/bf62e06e597ddc8179b9b2bf5c9304f81606e104
commit: bf62e06e597ddc8179b9b2bf5c9304f81606e104
branch: 3.12
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vstinner <vstinner at python.org>
date: 2023-06-06T18:14:55Z
summary:
[3.12] gh-94172: Update keyfile removal documentation (GH-105392) (#105402)
gh-94172: Update keyfile removal documentation (GH-105392)
Remove the "deprecated:: 3.6" markup, since the parameters (like
keyfile and certfile) got removed in Python 3.12.
(cherry picked from commit 2b8e6e5712a83657333948bc387c81db02549b13)
Co-authored-by: Victor Stinner <vstinner at python.org>
files:
M Doc/library/ftplib.rst
M Doc/library/http.client.rst
M Doc/library/imaplib.rst
M Doc/library/poplib.rst
M Doc/library/smtplib.rst
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 47054812f9f51..e7fb5b1ae2696 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -107,12 +107,6 @@ The module defines the following items:
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
:data:`ssl.HAS_SNI`).
- .. deprecated:: 3.6
- *keyfile* and *certfile* are deprecated in favor of *context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
.. versionchanged:: 3.9
If the *timeout* parameter is set to be zero, it will raise a
:class:`ValueError` to prevent the creation of a non-blocking socket.
@@ -120,7 +114,7 @@ The module defines the following items:
Latin-1 to UTF-8 to follow :rfc:`2640`.
.. versionchanged:: 3.12
- The deprecated *keyfile* and *certfile* parameters have been removed.
+ The deprecated *keyfile* and *certfile* parameters have been removed.
Here's a sample session using the :class:`FTP_TLS` class::
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 46d616aae95c9..45291933d635b 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -95,16 +95,6 @@ The module provides the following classes:
:func:`ssl._create_unverified_context` can be passed to the *context*
parameter.
- .. deprecated:: 3.6
- *key_file* and *cert_file* are deprecated in favor of *context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
- The *check_hostname* parameter is also deprecated; the
- :attr:`ssl.SSLContext.check_hostname` attribute of *context* should
- be used instead.
-
.. versionchanged:: 3.8
This class now enables TLS 1.3
:attr:`ssl.SSLContext.post_handshake_auth` for the default *context* or
@@ -116,8 +106,8 @@ The module provides the following classes:
ALPN protocols with :meth:`~ssl.SSLContext.set_alpn_protocol`.
.. versionchanged:: 3.12
- The deprecated *key_file*, *cert_file* and *check_hostname* parameters
- have been removed.
+ The deprecated *key_file*, *cert_file* and *check_hostname* parameters
+ have been removed.
.. class:: HTTPResponse(sock, debuglevel=0, method=None, url=None)
diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst
index f1344ae9bb0a4..59d7711f9cbd3 100644
--- a/Doc/library/imaplib.rst
+++ b/Doc/library/imaplib.rst
@@ -108,18 +108,11 @@ There's also a subclass for secure connections:
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
:data:`ssl.HAS_SNI`).
- .. deprecated:: 3.6
-
- *keyfile* and *certfile* are deprecated in favor of *ssl_context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
.. versionchanged:: 3.9
The optional *timeout* parameter was added.
.. versionchanged:: 3.12
- The deprecated *keyfile* and *certfile* parameters have been removed.
+ The deprecated *keyfile* and *certfile* parameters have been removed.
The second subclass allows for connections created by a child process:
diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
index d8618ce9b60bb..260c4a63d1203 100644
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -79,19 +79,12 @@ The :mod:`poplib` module provides two classes:
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
:data:`ssl.HAS_SNI`).
- .. deprecated:: 3.6
-
- *keyfile* and *certfile* are deprecated in favor of *context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
.. versionchanged:: 3.9
If the *timeout* parameter is set to be zero, it will raise a
:class:`ValueError` to prevent the creation of a non-blocking socket.
.. versionchanged:: 3.12
- The deprecated *keyfile* and *certfile* parameters have been removed.
+ The deprecated *keyfile* and *certfile* parameters have been removed.
One exception is defined as an attribute of the :mod:`poplib` module:
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index 4686232b09ac4..f90274feb6bf9 100644
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -100,19 +100,12 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions).
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
:data:`ssl.HAS_SNI`).
- .. deprecated:: 3.6
-
- *keyfile* and *certfile* are deprecated in favor of *context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
.. versionchanged:: 3.9
If the *timeout* parameter is set to be zero, it will raise a
:class:`ValueError` to prevent the creation of a non-blocking socket
.. versionchanged:: 3.12
- The deprecated *keyfile* and *certfile* parameters have been removed.
+ The deprecated *keyfile* and *certfile* parameters have been removed.
.. class:: LMTP(host='', port=LMTP_PORT, local_hostname=None, \
source_address=None[, timeout])
@@ -407,15 +400,8 @@ An :class:`SMTP` instance has the following methods:
If there has been no previous ``EHLO`` or ``HELO`` command this session,
this method tries ESMTP ``EHLO`` first.
- .. deprecated:: 3.6
-
- *keyfile* and *certfile* are deprecated in favor of *context*.
- Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
- :func:`ssl.create_default_context` select the system's trusted CA
- certificates for you.
-
.. versionchanged:: 3.12
- The deprecated *keyfile* and *certfile* parameters have been removed.
+ The deprecated *keyfile* and *certfile* parameters have been removed.
:exc:`SMTPHeloError`
The server didn't reply properly to the ``HELO`` greeting.
More information about the Python-checkins
mailing list