Commit 4531ec74 authored by Ned Deily's avatar Ned Deily Committed by GitHub

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

parent ef24b6c5
...@@ -4074,9 +4074,7 @@ class ThreadedTests(unittest.TestCase): ...@@ -4074,9 +4074,7 @@ class ThreadedTests(unittest.TestCase):
self.assertTrue(session) self.assertTrue(session)
with self.assertRaises(TypeError) as e: with self.assertRaises(TypeError) as e:
s.session = object s.session = object
self.assertEqual( self.assertEqual(str(e.exception), 'Value is not a SSLSession.')
str(e.exception), 'Value is not an SSLSession.'
)
with client_context.wrap_socket(socket.socket(), with client_context.wrap_socket(socket.socket(),
server_hostname=hostname) as s: server_hostname=hostname) as s:
......
...@@ -2066,7 +2066,7 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value, ...@@ -2066,7 +2066,7 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value,
SSL_set_SSL_CTX(self->ssl, self->ctx->ctx); SSL_set_SSL_CTX(self->ssl, self->ctx->ctx);
#endif #endif
} else { } else {
PyErr_SetString(PyExc_TypeError, "The value must be an SSLContext."); PyErr_SetString(PyExc_TypeError, "The value must be a SSLContext");
return -1; return -1;
} }
...@@ -2725,7 +2725,7 @@ static int PySSL_set_session(PySSLSocket *self, PyObject *value, ...@@ -2725,7 +2725,7 @@ static int PySSL_set_session(PySSLSocket *self, PyObject *value,
int result; int result;
if (!PySSLSession_Check(value)) { if (!PySSLSession_Check(value)) {
PyErr_SetString(PyExc_TypeError, "Value is not an SSLSession."); PyErr_SetString(PyExc_TypeError, "Value is not a SSLSession.");
return -1; return -1;
} }
pysess = (PySSLSession *)value; pysess = (PySSLSession *)value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment