Skip to content

gh-113119 fix environment handling in subprocess.Popen when posix_spawn is used #113120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 5 commits into from
Dec 17, 2023
Merged

gh-113119 fix environment handling in subprocess.Popen when posix_spawn is used #113120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0abca34
Allow posix_spawn to inherit environment form parent environ variable.
kulikjak Dec 14, 2023
8c0974c
Add documentation
kulikjak Dec 14, 2023
c321f35
Add NEWS fragment and whatsnew/3.13 entry
kulikjak Dec 15, 2023
bceeb7a
Merge branch 'main' into posix_spawn-fix-environment
gpshead Dec 17, 2023
ade82f1
remove trailing whitespace
gpshead Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Allow posix_spawn to inherit environment form parent environ variable. 
With this change, posix_spawn call can behave similarly to execv with regards to environments when used in subprocess functions.
  • Loading branch information
@kulikjak
kulikjak committed Dec 14, 2023
commit 0abca3465b85b9e295ee23fbb54833514a285408
3 changes: 0 additions & 3 deletions Lib/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,9 +1756,6 @@ def _posix_spawn(self, args, executable, env, restore_signals,
c2pread, c2pwrite,
errread, errwrite):
"""Execute program using os.posix_spawn()."""
if env is None:
env = os.environ

kwargs = {}
if restore_signals:
# See _Py_RestoreSignals() in Python/pylifecycle.c
Expand Down
16 changes: 10 additions & 6 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7082,9 +7082,9 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a
return NULL;
}

if (!PyMapping_Check(env)) {
if (!PyMapping_Check(env) && env != Py_None) {
PyErr_Format(PyExc_TypeError,
"%s: environment must be a mapping object", func_name);
"%s: environment must be a mapping object or None", func_name);
goto exit;
}

Expand All @@ -7098,9 +7098,13 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a
goto exit;
}

envlist = parse_envlist(env, &envc);
if (envlist == NULL) {
goto exit;
if (env == Py_None) {
envlist = environ;
} else {
envlist = parse_envlist(env, &envc);
if (envlist == NULL) {
goto exit;
}
}

if (file_actions != NULL && file_actions != Py_None) {
Expand Down Expand Up @@ -7163,7 +7167,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a
if (attrp) {
(void)posix_spawnattr_destroy(attrp);
}
if (envlist) {
if (envlist && envlist != environ) {
free_string_array(envlist, envc);
}
if (argvlist) {
Expand Down