commit 42198571c586e0dc56836b79329f94952b1975bb
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jun 11 17:58:06 2018 -0700
committer Ned Deily <nad@python.org> Mon Jun 11 20:58:06 2018 -0400
tree d4961ff5d570585af1e8ee68189da05f8631decd
parent a5db479ac4cdcc0d94ec1d7a594720a651d90433

bpo-31432: Revert unrelated code changes to _ssl.c and test_ssl (GH-7650) (GH-7651)

(cherry picked from commit 4531ec74c4a9c8e15ee2bdec11b12796ce000f6f)

Co-authored-by: Ned Deily <nad@python.org>

Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index b704b78..7bbaa9f 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4101,9 +4101,7 @@
                 self.assertTrue(session)
                 with self.assertRaises(TypeError) as e:
                     s.session = object
-                self.assertEqual(
-                    str(e.exception), 'Value is not an SSLSession.'
-                )
+                self.assertEqual(str(e.exception), 'Value is not a SSLSession.')
 
             with client_context.wrap_socket(socket.socket(),
                                             server_hostname=hostname) as s:

Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 991b38a..bf379f0 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2067,7 +2067,7 @@
         SSL_set_SSL_CTX(self->ssl, self->ctx->ctx);
 #endif
     } else {
-        PyErr_SetString(PyExc_TypeError, "The value must be an SSLContext.");
+        PyErr_SetString(PyExc_TypeError, "The value must be a SSLContext");
         return -1;
     }
 
@@ -2726,7 +2726,7 @@
     int result;
 
     if (!PySSLSession_Check(value)) {
-        PyErr_SetString(PyExc_TypeError, "Value is not an SSLSession.");
+        PyErr_SetString(PyExc_TypeError, "Value is not a SSLSession.");
         return -1;
     }
     pysess = (PySSLSession *)value;