fix more site

youknowone · youknowone · commit c11f37d374e1 · 2025-12-26T15:49:34.000+09:00
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
@@ -411,8 +411,6 @@ def test_issue8202(self):
                                    script_name, script_name, script_dir, 'test_pkg',
                                    importlib.machinery.SourceFileLoader)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_issue8202_dash_c_file_ignored(self):
         # Make sure a "-c" file in the current directory
         # does not alter the value of sys.path[0]
@@ -713,8 +711,6 @@ def test_syntaxerror_null_bytes_in_multiline_string(self):
                     ]
                 )
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_consistent_sys_path_for_direct_execution(self):
         # This test case ensures that the following all give the same
         # sys.path configuration:
diff --git a/src/lib.rs b/src/lib.rs
@@ -169,7 +169,18 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> {
 
     let scope = setup_main_module(vm)?;
 
-    // _PyPathConfig_ComputeSysPath0
+    // 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
+    let site_result = vm.import("site", 0);
+    if site_result.is_err() {
+        warn!(
+            "Failed to import site, consider adding the Lib directory to your RUSTPYTHONPATH \
+             environment variable",
+        );
+    }
+
+    // _PyPathConfig_ComputeSysPath0 - set sys.path[0] after site import
     if !vm.state.config.settings.safe_path {
         let path0: Option<String> = match &run_mode {
             RunMode::Command(_) => Some(String::new()),
@@ -185,14 +196,6 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> {
         }
     }
 
-    let site_result = vm.import("site", 0);
-    if site_result.is_err() {
-        warn!(
-            "Failed to import site, consider adding the Lib directory to your RUSTPYTHONPATH \
-             environment variable",
-        );
-    }
-
     // Enable faulthandler if -X faulthandler, PYTHONFAULTHANDLER or -X dev is set
     // _PyFaulthandler_Init()
     if vm.state.config.settings.faulthandler {
