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

miss-islington · j178 · web-flow · commit 08f2b9dedea1 · 2021-06-17T03:00:56.000-07:00
`ssl.SSL_NO_TLS` should be `ssl.OP_NO_TLS`. (cherry picked from commit c544393) Co-authored-by: Joe <nigelchiang@outlook.com>
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -609,7 +609,7 @@ def test_openssl111_deprecations(self):
                 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
@@ -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;
         }

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ def test_openssl111_deprecations(self):`
`609`	`609`	`with self.assertWarns(DeprecationWarning) as cm:`
`610`	`610`	`ctx.options \|= option`
`611`	`611`	`self.assertEqual(`
`612`		`- 'ssl.OP_NO_SSL/ssl.SSL_NO_TLS options are deprecated',`
	`612`	`+ 'ssl.OP_NO_SSL/ssl.OP_NO_TLS options are deprecated',`
`613`	`613`	`str(cm.warning)`
`614`	`614`	`)`
`615`	`615`
Original file line number	Diff line number	Diff line change
`@@ -3597,7 +3597,7 @@ set_options(PySSLContext self, PyObject arg, void *c)`
`3597`	`3597`	`set = ~opts & new_opts;`
`3598`	`3598`
`3599`	`3599`	`if ((set & opt_no) != 0) {`
`3600`		`- if (_ssl_deprecated("ssl.OP_NO_SSL/ssl.SSL_NO_TLS options are "`
	`3600`	`+ if (_ssl_deprecated("ssl.OP_NO_SSL/ssl.OP_NO_TLS options are "`
`3601`	`3601`	`"deprecated", 2) < 0) {`
`3602`	`3602`	`return -1;`
`3603`	`3603`	`}`