Skip to content

Fix encodings related error messages to be less confusing #5049

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 8 commits into from
Aug 30, 2023
Merged

Fix encodings related error messages to be less confusing #5049

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7aea958
Move cwd setup to interpreter code
youknowone Aug 27, 2023
159c3a7
rework import encodings failure message
youknowone Aug 27, 2023
e970ff8
try import_encodings only when `path_list` is set
youknowone Aug 27, 2023
9b8f9f6
Fix grammars
youknowone Aug 29, 2023
0f3fa4b
std::mem::take instead of drain(..).collect()
youknowone Aug 29, 2023
dae977d
Add empty path_list warnings to import_encodings
youknowone Aug 29, 2023
3fa8773
Prepend current working directory when !safe_path
youknowone Aug 30, 2023
d587fb7
Apply suggestions from code review
youknowone Aug 30, 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
Prev Previous commit
Next Next commit
Prepend current working directory when !safe_path
  • Loading branch information
@youknowone
youknowone committed Aug 30, 2023
commit 3fa877321488e1c1b119457a3cce707733858cfb
13 changes: 10 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ pub fn run(init: impl FnOnce(&mut VirtualMachine) + 'static) -> ExitCode {
}
}

// add current working directory to sys.path
let settings = settings.with_path("".to_owned());
let mut config = InterpreterConfig::new().settings(settings);
#[cfg(feature = "stdlib")]
{
Expand Down Expand Up @@ -167,8 +165,17 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode, quiet: bool) -> PyResu

let scope = setup_main_module(vm)?;

let site_result = vm.import("site", None, 0);
if !vm.state.settings.safe_path {
// TODO: The prepending path depends on running mode
// See https://docs.python.org/3/using/cmdline.html#cmdoption-P
vm.run_code_string(
vm.new_scope_with_builtins(),
"import sys; sys.path.insert(0, '')",
"<embedded>".to_owned(),
)?;
}

let site_result = vm.import("site", None, 0);
if site_result.is_err() {
warn!(
"Failed to import site, consider adding the Lib directory to your RUSTPYTHONPATH \
Expand Down