◐ Shell
reader mode source ↗
Skip to content
Merged

init warnings before site #6771

Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
12 changes: 6 additions & 6 deletions src/lib.rs
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> {

let scope = vm.new_scope_with_main()?;

// Import site first, before setting sys.path[0]
// This matches CPython's behavior where site.removeduppaths() runs
// before sys.path[0] is set, preventing '' from being converted to cwd
Expand All @@ -219,12 +225,6 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> {
);
}

// Initialize warnings module to process sys.warnoptions
// _PyWarnings_Init()
if vm.import("warnings", 0).is_err() {
warn!("Failed to import warnings module");
}

// _PyPathConfig_ComputeSysPath0 - set sys.path[0] after site import
if !vm.state.config.settings.safe_path {
let path0: Option<String> = match &run_mode {
Expand Down
Loading
Toggle all file notes Toggle all file annotations