Fix sysconfigdata platform-specific alias name registration

youknowone · youknowone · commit 203756d2cee1 · 2026-01-21T23:54:15.000+09:00
- Register _sysconfigdata under both short name and platform-specific name
- Refactor sysconfigdata_name() to be reusable across modules
- Add platform-specific name to sys.builtin_module_names
- Eliminate code duplication in sysconfigdata name formatting

This fixes the CI failure where sysconfig module imports
'_sysconfigdata_t_darwin_aarch64-apple-darwin' but RustPython
only registered '_sysconfigdata'.

PyGlobalState
diff --git a/crates/common/src/crt_fd.rs b/crates/common/src/crt_fd.rs
@@ -5,8 +5,10 @@ use alloc::fmt;
 use core::cmp;
 use std::{ffi, io};
 
+#[cfg(unix)]
+use std::os::fd::AsFd;
 #[cfg(not(windows))]
-use std::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
+use std::os::fd::{AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::BorrowedHandle;
 
diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs
@@ -1,14 +1,12 @@
 // spell-checker:disable
 
-use crate::{PyRef, VirtualMachine, builtins::PyModule};
-
 pub(crate) use module::module_def;
 pub use module::raw_set_handle_inheritable;
 
 #[pymodule(name = "nt", with(super::os::_os))]
 pub(crate) mod module {
     use crate::{
-        PyResult, TryFromObject, VirtualMachine,
+        Py, PyResult, TryFromObject, VirtualMachine,
         builtins::{PyBaseExceptionRef, PyDictRef, PyListRef, PyStrRef, PyTupleRef},
         common::{crt_fd, suppress_iph, windows::ToWideString},
         convert::ToPyException,
diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs
@@ -149,6 +149,8 @@ pub(super) mod _os {
     use super::{DirFd, FollowSymlinks, SupportFunc};
     #[cfg(windows)]
     use crate::common::windows::ToWideString;
+    #[cfg(any(unix, windows))]
+    use crate::utils::ToCString;
     use crate::{
         AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject,
         builtins::{
@@ -168,7 +170,6 @@ pub(super) mod _os {
         protocol::PyIterReturn,
         recursion::ReprGuard,
         types::{IterNext, Iterable, PyStructSequence, Representable, SelfIter},
-        utils::ToCString,
         vm::VirtualMachine,
     };
     use core::time::Duration;
diff --git a/crates/vm/src/stdlib/posix_compat.rs b/crates/vm/src/stdlib/posix_compat.rs
@@ -1,7 +1,6 @@
 // spell-checker:disable
 
 //! `posix` compatible module for `not(any(unix, windows))`
-use crate::{PyRef, VirtualMachine, builtins::PyModule};
 
 pub(crate) use module::module_def;
 
diff --git a/crates/vm/src/stdlib/stat.rs b/crates/vm/src/stdlib/stat.rs
@@ -1,7 +1,7 @@
-pub(crate) use stat::module_def;
+pub(crate) use _stat::module_def;
 
 #[pymodule]
-mod stat {
+mod _stat {
     // Use libc::mode_t for Mode to match the system's definition
     #[cfg(unix)]
     type Mode = libc::mode_t;
diff --git a/crates/vm/src/stdlib/symtable.rs b/crates/vm/src/stdlib/symtable.rs
@@ -1,7 +1,7 @@
-pub(crate) use symtable::module_def;
+pub(crate) use _symtable::module_def;
 
 #[pymodule]
-mod symtable {
+mod _symtable {
     use crate::{
         PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
         builtins::{PyDictRef, PyStrRef},
diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs
@@ -78,7 +78,7 @@ mod sys {
     #[pyattr(name = "abiflags")]
     const ABIFLAGS_ATTR: &str = "t"; // 't' for free-threaded (no GIL)
     // Internal constant used for sysconfigdata_name
-    pub(crate) const ABIFLAGS: &str = "t";
+    pub const ABIFLAGS: &str = "t";
     #[pyattr(name = "api_version")]
     const API_VERSION: u32 = 0x0; // what C api?
     #[pyattr(name = "copyright")]
@@ -94,7 +94,7 @@ mod sys {
     #[pyattr(name = "maxunicode")]
     const MAXUNICODE: u32 = core::char::MAX as u32;
     #[pyattr(name = "platform")]
-    pub(crate) const PLATFORM: &str = {
+    pub const PLATFORM: &str = {
         cfg_if::cfg_if! {
             if #[cfg(target_os = "linux")] {
                 "linux"
@@ -166,9 +166,11 @@ mod sys {
 
     #[pyattr]
     fn builtin_module_names(vm: &VirtualMachine) -> PyTupleRef {
-        let mut module_names: Vec<&str> = vm.state.module_defs.keys().copied().collect();
-        module_names.push("sys");
-        module_names.push("builtins");
+        let mut module_names: Vec<String> =
+            vm.state.module_defs.keys().map(|&s| s.to_owned()).collect();
+        module_names.push("sys".to_owned());
+        module_names.push("builtins".to_owned());
+
         module_names.sort();
         vm.ctx.new_tuple(
             module_names
@@ -1673,7 +1675,7 @@ pub fn get_stderr(vm: &VirtualMachine) -> PyResult {
         .map_err(|_| vm.new_runtime_error("lost sys.stderr"))
 }
 
-pub(crate) fn sysconfigdata_name() -> String {
+pub fn sysconfigdata_name() -> String {
     format!(
         "_sysconfigdata_{}_{}_{}",
         sys::ABIFLAGS,
diff --git a/crates/vm/src/stdlib/sysconfig.rs b/crates/vm/src/stdlib/sysconfig.rs
@@ -1,7 +1,7 @@
-pub(crate) use sysconfig::module_def;
+pub(crate) use _sysconfig::module_def;
 
-#[pymodule(name = "_sysconfig")]
-pub(crate) mod sysconfig {
+#[pymodule]
+pub(crate) mod _sysconfig {
     use crate::{VirtualMachine, builtins::PyDictRef, convert::ToPyObject};
 
     #[pyfunction]
diff --git a/crates/vm/src/stdlib/sysconfigdata.rs b/crates/vm/src/stdlib/sysconfigdata.rs
@@ -16,10 +16,12 @@ mod _sysconfigdata {
         let build_time_vars = build_time_vars(vm);
         module.set_attr("build_time_vars", build_time_vars, vm)?;
 
-        // Add CPython-compatible alias to sys.modules
-        let sysconfigdata_name = sysconfigdata_name();
+        // Ensure the module is registered under the platform-specific name
+        // (import_builtin() already handles this, but double-check for safety)
         let sys_modules = vm.sys_module.get_attr("modules", vm)?;
+        let sysconfigdata_name = sysconfigdata_name();
         sys_modules.set_item(sysconfigdata_name.as_str(), module.to_owned().into(), vm)?;
+
         Ok(())
     }
 
diff --git a/crates/vm/src/stdlib/winreg.rs b/crates/vm/src/stdlib/winreg.rs
@@ -1,8 +1,6 @@
 // spell-checker:disable
 #![allow(non_snake_case)]
 
-use crate::{PyRef, VirtualMachine, builtins::PyModule};
-
 pub(crate) use winreg::module_def;
 
 #[pymodule]
diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs
diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs
diff --git a/src/interpreter.rs b/src/interpreter.rs
diff --git a/src/lib.rs b/src/lib.rs
