bpo-37951: Improve doc update

python · tiran · Aug 27, 2019 · Aug 27, 2019 · Aug 27, 2019 · Aug 27, 2019
commit 224bde754e2a66c82aa79d8e6b814f80853877b2
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
@@ -486,8 +486,9 @@ functions.
    .. versionchanged:: 3.8
 
       The *preexec_fn* parameter is no longer supported in subinterpreters.
-      The new restriction may affect applications that are deployed in
-      mod_wsgi, uWSGI, and other environments.
+      The use of the parameter in a subinterpreter raises
+      :exc:`RuntimeError`. The new restriction may affect applications that
+      are deployed in mod_wsgi, uWSGI, and other embedded environments.
 
    If *close_fds* is true, all file descriptors except :const:`0`, :const:`1` and
    :const:`2` will be closed before the child process is executed.  Otherwise

diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
@@ -1532,7 +1532,8 @@ Changes in the Python API
   (Contributed by Joannah Nanjekye and Victor Stinner in :issue:`35537`.)
 
 * The *preexec_fn* argument of * :class:`subprocess.Popen` is no longer
-  compatible with subinterpreters.
+  compatible with subinterpreters. The use of the parameter in a
+  subinterpreter now raises :exc:`RuntimeError`.
   (Contributed by Eric Snow in :issue:`34651`, modified by Christian Heimes
   in :issue:`37951`.)
 

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
@@ -585,7 +585,8 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
 
     if ((preexec_fn != Py_None) &&
             (_PyInterpreterState_Get() != PyInterpreterState_Main())) {
-        PyErr_SetString(PyExc_RuntimeError, "preexec_fn not supported for subinterpreters");
+        PyErr_SetString(PyExc_RuntimeError,
+                        "preexec_fn not supported within subinterpreters");
         return NULL;
     }