Skip to content

Fix subprocess and Update subprocess from Python 3.13.11 #6583

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
youknowone merged 7 commits into from
Dec 30, 2025
Merged

Fix subprocess and Update subprocess from Python 3.13.11 #6583

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88e7760
fix test_subprocess
youknowone Dec 29, 2025
6f52a0b
fix posixsubprocess
youknowone Dec 29, 2025
b339768
fix io warning
youknowone Dec 29, 2025
0988633
Update subprocess from Python 3.13.11
youknowone Dec 29, 2025
ffcda01
fix
youknowone Dec 29, 2025
2b2236c
Auto-format: cargo fmt --all
github-actions[bot] Dec 29, 2025
5c5cacc
fix macos
youknowone Dec 29, 2025
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
Prev Previous commit
fix macos
  • Loading branch information
@youknowone
youknowone committed Dec 29, 2025
commit 5c5caccfd930f1ecf3b064c6063b2a336672a3a0
19 changes: 17 additions & 2 deletions crates/vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ pub mod module {
#[pyarg(positional)]
args: crate::function::ArgIterable<OsPath>,
#[pyarg(positional)]
env: crate::function::ArgMapping,
env: Option<crate::function::ArgMapping>,
#[pyarg(named, default)]
file_actions: Option<crate::function::ArgIterable<PyTupleRef>>,
#[pyarg(named, default)]
Expand Down Expand Up @@ -1678,7 +1678,22 @@ pub mod module {
.map_err(|_| vm.new_value_error("path should not have nul bytes"))
})
.collect::<Result<_, _>>()?;
let env = envp_from_dict(self.env, vm)?;
let env = if let Some(env_dict) = self.env {
envp_from_dict(env_dict, vm)?
} else {
// env=None means use the current environment
use rustpython_common::os::ffi::OsStringExt;
env::vars_os()
.map(|(k, v)| {
let mut entry = k.into_vec();
entry.push(b'=');
entry.extend(v.into_vec());
CString::new(entry).map_err(|_| {
vm.new_value_error("environment string contains null byte")
})
})
.collect::<PyResult<Vec<_>>>()?
};

let ret = if spawnp {
nix::spawn::posix_spawnp(&path, &file_actions, &attrp, &args, &env)
Expand Down
Loading