Better grammar and fix for other test using test_dh_params

Author: zooba

Lib/test/audit-tests.py

@@ -208,7 +208,15 @@ def test_open(testfn):
             if not fn:
                 continue
             with assertRaises(RuntimeError):
-                fn(*args)
+                try:
+                    fn(*args)
+                except NotImplementedError:
+                    if fn == load_dh_params:
+                        # Not callable in some builds
+                        load_dh_params = None
+                        raise RuntimeError
+                    else:
+                        raise
 
     actual_mode = [(a[0], a[1]) for e, a in hook.seen if e == "open" and a[1]]
     actual_flag = [(a[0], a[2]) for e, a in hook.seen if e == "open" and not a[1]]

Lib/test/test_audit.py

@@ -23,6 +23,7 @@ def run_test_in_subprocess(self, *args):
         with subprocess.Popen(
             [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
             encoding="utf-8",
+            errors="backslashreplace",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
         ) as p:

Modules/_ssl.c

@@ -4428,8 +4428,8 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath)
     DH *dh;
 
 #if defined(MS_WINDOWS) && defined(_DEBUG)
-    PyErr_SetString(PyExc_RuntimeError,
-                    "unable to load_dh_params on Windows debug build");
+    PyErr_SetString(PyExc_NotImplementedError,
+                    "load_dh_params: unavailable on Windows debug build");
     return NULL;
 #endif
 

Modules/_ssl/debughelpers.c

@@ -176,8 +176,8 @@ _PySSLContext_set_keylog_filename(PyObject *op, PyObject *arg,
     FILE *fp;
 
 #if defined(MS_WINDOWS) && defined(_DEBUG)
-    PyErr_SetString(PyExc_RuntimeError,
-                    "unable to set_keylog_filename on Windows debug build");
+    PyErr_SetString(PyExc_NotImplementedError,
+                    "set_keylog_filename: unavailable on Windows debug build");
     return -1;
 #endif