Skip to content

Commit 2b8e6e5

Browse files
authored
pythongh-94172: Update keyfile removal documentation (python#105392)
Remove the "deprecated:: 3.6" markup, since the parameters (like keyfile and certfile) got removed in Python 3.12.
1 parent 3907de1 commit 2b8e6e5

File tree

5 files changed

+7
-51
lines changed

5 files changed

+7
-51
lines changed

Doc/library/ftplib.rst

+1-7
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,14 @@ The module defines the following items:
107107
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
108108
:data:`ssl.HAS_SNI`).
109109

110-
.. deprecated:: 3.6
111-
*keyfile* and *certfile* are deprecated in favor of *context*.
112-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
113-
:func:`ssl.create_default_context` select the system's trusted CA
114-
certificates for you.
115-
116110
.. versionchanged:: 3.9
117111
If the *timeout* parameter is set to be zero, it will raise a
118112
:class:`ValueError` to prevent the creation of a non-blocking socket.
119113
The *encoding* parameter was added, and the default was changed from
120114
Latin-1 to UTF-8 to follow :rfc:`2640`.
121115

122116
.. versionchanged:: 3.12
123-
The deprecated *keyfile* and *certfile* parameters have been removed.
117+
The deprecated *keyfile* and *certfile* parameters have been removed.
124118

125119
Here's a sample session using the :class:`FTP_TLS` class::
126120

Doc/library/http.client.rst

+2-12
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ The module provides the following classes:
9595
:func:`ssl._create_unverified_context` can be passed to the *context*
9696
parameter.
9797

98-
.. deprecated:: 3.6
99-
*key_file* and *cert_file* are deprecated in favor of *context*.
100-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
101-
:func:`ssl.create_default_context` select the system's trusted CA
102-
certificates for you.
103-
104-
The *check_hostname* parameter is also deprecated; the
105-
:attr:`ssl.SSLContext.check_hostname` attribute of *context* should
106-
be used instead.
107-
10898
.. versionchanged:: 3.8
10999
This class now enables TLS 1.3
110100
:attr:`ssl.SSLContext.post_handshake_auth` for the default *context* or
@@ -116,8 +106,8 @@ The module provides the following classes:
116106
ALPN protocols with :meth:`~ssl.SSLContext.set_alpn_protocol`.
117107

118108
.. versionchanged:: 3.12
119-
The deprecated *key_file*, *cert_file* and *check_hostname* parameters
120-
have been removed.
109+
The deprecated *key_file*, *cert_file* and *check_hostname* parameters
110+
have been removed.
121111

122112

123113
.. class:: HTTPResponse(sock, debuglevel=0, method=None, url=None)

Doc/library/imaplib.rst

+1-8
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,11 @@ There's also a subclass for secure connections:
108108
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
109109
:data:`ssl.HAS_SNI`).
110110

111-
.. deprecated:: 3.6
112-
113-
*keyfile* and *certfile* are deprecated in favor of *ssl_context*.
114-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
115-
:func:`ssl.create_default_context` select the system's trusted CA
116-
certificates for you.
117-
118111
.. versionchanged:: 3.9
119112
The optional *timeout* parameter was added.
120113

121114
.. versionchanged:: 3.12
122-
The deprecated *keyfile* and *certfile* parameters have been removed.
115+
The deprecated *keyfile* and *certfile* parameters have been removed.
123116

124117
The second subclass allows for connections created by a child process:
125118

Doc/library/poplib.rst

+1-8
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,12 @@ The :mod:`poplib` module provides two classes:
7979
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
8080
:data:`ssl.HAS_SNI`).
8181

82-
.. deprecated:: 3.6
83-
84-
*keyfile* and *certfile* are deprecated in favor of *context*.
85-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
86-
:func:`ssl.create_default_context` select the system's trusted CA
87-
certificates for you.
88-
8982
.. versionchanged:: 3.9
9083
If the *timeout* parameter is set to be zero, it will raise a
9184
:class:`ValueError` to prevent the creation of a non-blocking socket.
9285

9386
.. versionchanged:: 3.12
94-
The deprecated *keyfile* and *certfile* parameters have been removed.
87+
The deprecated *keyfile* and *certfile* parameters have been removed.
9588

9689
One exception is defined as an attribute of the :mod:`poplib` module:
9790

Doc/library/smtplib.rst

+2-16
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,12 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions).
100100
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
101101
:data:`ssl.HAS_SNI`).
102102

103-
.. deprecated:: 3.6
104-
105-
*keyfile* and *certfile* are deprecated in favor of *context*.
106-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
107-
:func:`ssl.create_default_context` select the system's trusted CA
108-
certificates for you.
109-
110103
.. versionchanged:: 3.9
111104
If the *timeout* parameter is set to be zero, it will raise a
112105
:class:`ValueError` to prevent the creation of a non-blocking socket
113106

114107
.. versionchanged:: 3.12
115-
The deprecated *keyfile* and *certfile* parameters have been removed.
108+
The deprecated *keyfile* and *certfile* parameters have been removed.
116109

117110
.. class:: LMTP(host='', port=LMTP_PORT, local_hostname=None, \
118111
source_address=None[, timeout])
@@ -407,15 +400,8 @@ An :class:`SMTP` instance has the following methods:
407400
If there has been no previous ``EHLO`` or ``HELO`` command this session,
408401
this method tries ESMTP ``EHLO`` first.
409402

410-
.. deprecated:: 3.6
411-
412-
*keyfile* and *certfile* are deprecated in favor of *context*.
413-
Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let
414-
:func:`ssl.create_default_context` select the system's trusted CA
415-
certificates for you.
416-
417403
.. versionchanged:: 3.12
418-
The deprecated *keyfile* and *certfile* parameters have been removed.
404+
The deprecated *keyfile* and *certfile* parameters have been removed.
419405

420406
:exc:`SMTPHeloError`
421407
The server didn't reply properly to the ``HELO`` greeting.

0 commit comments

Comments
 (0)