nt junction (#6407)

youknowone · web-flow · commit 3438fb2850a3 · 2025-12-12T09:03:19.000+09:00
* pylib strip path

* nt._path_* functions,

* nt junction
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
@@ -1383,7 +1383,6 @@ def test_nt_helpers(self):
             self.assertIsInstance(b_final_path, bytes)
             self.assertGreater(len(b_final_path), 0)
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON
     @unittest.skipIf(sys.platform != 'win32', "Can only test junctions with creation on win32.")
     def test_isjunction(self):
         with os_helper.temp_dir() as d:
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -3130,7 +3130,6 @@ def tearDown(self):
         if os.path.lexists(self.junction):
             os.unlink(self.junction)
 
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; (AttributeError: module '_winapi' has no attribute 'CreateJunction')")
     def test_create_junction(self):
         _winapi.CreateJunction(self.junction_target, self.junction)
         self.assertTrue(os.path.lexists(self.junction))
diff --git a/crates/pylib/build.rs b/crates/pylib/build.rs
@@ -16,10 +16,10 @@ fn main() {
     {
         let canonicalized_path = std::fs::canonicalize(real_path)
             .expect("failed to resolve RUSTPYTHONPATH during build time");
-        println!(
-            "cargo:rustc-env=win_lib_path={}",
-            canonicalized_path.to_str().unwrap()
-        );
+        // Strip the extended path prefix (\\?\) that canonicalize adds on Windows
+        let path_str = canonicalized_path.to_str().unwrap();
+        let path_str = path_str.strip_prefix(r"\\?\").unwrap_or(path_str);
+        println!("cargo:rustc-env=win_lib_path={path_str}");
     }
 }
 
diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml
@@ -124,7 +124,9 @@ features = [
   "Win32_System_Console",
   "Win32_System_Diagnostics_Debug",
   "Win32_System_Environment",
+  "Win32_System_IO",
   "Win32_System_Ioctl",
+  "Win32_System_Kernel",
   "Win32_System_LibraryLoader",
   "Win32_System_Memory",
   "Win32_System_Performance",
diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ fn main() {`
`16`	`16`	`{`
`17`	`17`	`let canonicalized_path = std::fs::canonicalize(real_path)`
`18`	`18`	`.expect("failed to resolve RUSTPYTHONPATH during build time");`
`19`		`- println!(`
`20`		`- "cargo:rustc-env=win_lib_path={}",`
`21`		`- canonicalized_path.to_str().unwrap()`
`22`		`- );`
	`19`	`+ // Strip the extended path prefix (\\?\) that canonicalize adds on Windows`
	`20`	`+ let path_str = canonicalized_path.to_str().unwrap();`
	`21`	`+ let path_str = path_str.strip_prefix(r"\\?\").unwrap_or(path_str);`
	`22`	`+ println!("cargo:rustc-env=win_lib_path={path_str}");`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`