move path "" to vm.initialize

youknowone · youknowone · commit e8b9b4b4de4b · 2022-09-05T10:38:40.000+09:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -261,9 +261,6 @@ fn add_stdlib(vm: &mut VirtualMachine) {
         #[allow(clippy::needless_collect)] // false positive
         let path_list: Vec<_> = state.settings.path_list.drain(..).collect();
 
-        // add the current directory to sys.path
-        state.settings.path_list.push("".to_owned());
-
         // BUILDTIME_RUSTPYTHONPATH should be set when distributing
         if let Some(paths) = option_env!("BUILDTIME_RUSTPYTHONPATH") {
             state
diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs
@@ -227,6 +227,9 @@ impl VirtualMachine {
             panic!("Double Initialize Error");
         }
 
+        // add the current directory to sys.path
+        self.state_mut().settings.path_list.insert(0, "".to_owned());
+
         stdlib::builtins::make_module(self, self.builtins.clone().into());
         stdlib::sys::init_module(self, self.sys_module.as_ref(), self.builtins.as_ref());
 

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,9 @@ impl VirtualMachine {`
`227`	`227`	`panic!("Double Initialize Error");`
`228`	`228`	`}`
`229`	`229`
	`230`	`+ // add the current directory to sys.path`
	`231`	`+ self.state_mut().settings.path_list.insert(0, "".to_owned());`
	`232`	`+`
`230`	`233`	`stdlib::builtins::make_module(self, self.builtins.clone().into());`
`231`	`234`	`stdlib::sys::init_module(self, self.sys_module.as_ref(), self.builtins.as_ref());`
`232`	`235`