Fix CI: handle surrogate strings in import, add expectedFailure for Windows-only tests

youknowone · youknowone · commit d4bf285bf8f5 · 2026-02-08T13:44:50.000+09:00
- Use to_str() instead of as_str() in import_module_level and get_spec_origin to avoid panic on strings with surrogates - Add @expectedfailure for test_dll_dependency_import (no C extension), test_unencodable_filename (subprocess), test_tagged_suffix (no .pyd)
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
@@ -768,6 +768,7 @@ def run():
         finally:
             del sys.path[0]
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; no C extension support
     @unittest.skipUnless(sys.platform == "win32", "Windows-specific")
     def test_dll_dependency_import(self):
         from _winapi import GetModuleFileName
@@ -2043,6 +2044,7 @@ def exec_module(*args):
             else:
                 importlib.SourceLoader.exec_module = old_exec_module
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; subprocess fails on Windows
     @unittest.skipUnless(TESTFN_UNENCODABLE, 'need TESTFN_UNENCODABLE')
     def test_unencodable_filename(self):
         # Issue #11619: The Python parser and the import machinery must not
diff --git a/Lib/test/test_importlib/test_windows.py b/Lib/test/test_importlib/test_windows.py
@@ -139,6 +139,7 @@ def test_raises_deprecation_warning(self):
 
 @unittest.skipUnless(sys.platform.startswith('win'), 'requires Windows')
 class WindowsExtensionSuffixTests:
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; no C extension (.pyd) support
     def test_tagged_suffix(self):
         suffixes = self.machinery.EXTENSION_SUFFIXES
         abi_flags = "t" if support.Py_GIL_DISABLED else ""
diff --git a/crates/vm/src/import.rs b/crates/vm/src/import.rs
@@ -257,7 +257,7 @@ pub(crate) fn get_spec_file_origin(
         } else {
             origin
                 .downcast_ref::<PyStr>()
-                .map(|s| s.as_str().to_owned())
+                .and_then(|s| s.to_str().map(|s| s.to_owned()))
         }
     })
 }
@@ -354,7 +354,9 @@ pub fn import_module_level(
         return Err(vm.new_value_error("level must be >= 0".to_owned()));
     }
 
-    let name_str = name.as_str();
+    let name_str = name.to_str().ok_or_else(|| {
+        vm.new_value_error("module name cannot contain surrogates".to_owned())
+    })?;
 
     // Resolve absolute name
     let abs_name = if level > 0 {

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ pub(crate) fn get_spec_file_origin(`
`257`	`257`	`} else {`
`258`	`258`	`origin`
`259`	`259`	`.downcast_ref::<PyStr>()`
`260`		`- .map(\|s\| s.as_str().to_owned())`
	`260`	`+ .and_then(\|s\| s.to_str().map(\|s\| s.to_owned()))`
`261`	`261`	`}`
`262`	`262`	`})`
`263`	`263`	`}`
`@@ -354,7 +354,9 @@ pub fn import_module_level(`
`354`	`354`	`return Err(vm.new_value_error("level must be >= 0".to_owned()));`
`355`	`355`	`}`
`356`	`356`
`357`		`- let name_str = name.as_str();`
	`357`	`+ let name_str = name.to_str().ok_or_else(\|\| {`
	`358`	`+ vm.new_value_error("module name cannot contain surrogates".to_owned())`
	`359`	`+ })?;`
`358`	`360`
`359`	`361`	`// Resolve absolute name`
`360`	`362`	`let abs_name = if level > 0 {`