From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 17 Jun 2021 10:00:56 +0000 (-0700)
Subject: bpo-44389: Fix typo in ssl deprecation warning message (GH-26754)
X-Git-Tag: v3.10.0b3~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08f2b9dedea13d2e9d11c189914387db3a66e2ca;p=thirdparty%2FPython%2Fcpython.git

bpo-44389: Fix typo in ssl deprecation warning message (GH-26754)


`ssl.SSL_NO_TLS` should be `ssl.OP_NO_TLS`.
(cherry picked from commit c544393b89f9b3e2b1a22588fc9ae58019314879)

Co-authored-by: Joe <nigelchiang@outlook.com>
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index eddb85144cc5..06e501e39678 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -609,7 +609,7 @@ class BasicSocketTests(unittest.TestCase):
                 with self.assertWarns(DeprecationWarning) as cm:
                     ctx.options |= option
                 self.assertEqual(
-                    'ssl.OP_NO_SSL*/ssl.SSL_NO_TLS* options are deprecated',
+                    'ssl.OP_NO_SSL*/ssl.OP_NO_TLS* options are deprecated',
                     str(cm.warning)
                 )
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 26f31f8f4c53..ad5269d7b07b 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3597,7 +3597,7 @@ set_options(PySSLContext *self, PyObject *arg, void *c)
     set = ~opts & new_opts;
 
     if ((set & opt_no) != 0) {
-        if (_ssl_deprecated("ssl.OP_NO_SSL*/ssl.SSL_NO_TLS* options are "
+        if (_ssl_deprecated("ssl.OP_NO_SSL*/ssl.OP_NO_TLS* options are "
                             "deprecated", 2) < 0) {
             return -1;
         }