[2.7] bpo-28958: Improve SSLContext error reporting. (GH-3414) (#3433)

tiran · web-flow · commit 611a3eab194d · 2017-09-07T16:45:07.000-07:00
Signed-off-by: Christian Heimes &lt;christian@python.org&gt;
(cherry picked from commit 17c9ac9)
diff --git a/Misc/NEWS.d/next/Library/2017-09-06-19-41-01.bpo-28958.x4-K5F.rst b/Misc/NEWS.d/next/Library/2017-09-06-19-41-01.bpo-28958.x4-K5F.rst
@@ -0,0 +1,2 @@
+ssl.SSLContext() now uses OpenSSL error information when a context cannot be
+instantiated.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -2146,8 +2146,7 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     }
     if (ctx == NULL) {
-        PyErr_SetString(PySSLErrorObject,
-                        "failed to allocate SSL context");
+        _setSSLError(NULL, 0, __FILE__, __LINE__);
         return NULL;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ssl.SSLContext() now uses OpenSSL error information when a context cannot be`
	`2`	`+instantiated.`
Original file line number	Diff line number	Diff line change
`@@ -2146,8 +2146,7 @@ context_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`2146`	`2146`	`return NULL;`
`2147`	`2147`	`}`
`2148`	`2148`	`if (ctx == NULL) {`
`2149`		`- PyErr_SetString(PySSLErrorObject,`
`2150`		`- "failed to allocate SSL context");`
	`2149`	`+ _setSSLError(NULL, 0, __FILE__, __LINE__);`
`2151`	`2150`	`return NULL;`
`2152`	`2151`	`}`
`2153`	`2152`