Skip to content

Fix test_subprocess and locale #6416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Dec 12, 2025
Merged

Fix test_subprocess and locale #6416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9fa405
Fix test_subprocess
youknowone Dec 12, 2025
752c0f6
fix windows locale
youknowone Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix windows locale
  • Loading branch information
@youknowone
youknowone committed Dec 12, 2025
commit 752c0f68fd76b76aa85552be33a880fac65745e7
1 change: 0 additions & 1 deletion Lib/test/test_locale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,6 @@ def test_getsetlocale_issue1813(self):
self.skipTest(f"setlocale(LC_CTYPE, {loc!r}) failed: {exc!r}")
self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE))

@unittest.expectedFailureIfWindows('TODO: RUSTPYTHON; Error not raised')
@unittest.skipUnless(os.name == 'nt', 'requires Windows')
def test_setlocale_long_encoding(self):
with self.assertRaises(locale.Error):
Expand Down
43 changes: 43 additions & 0 deletions crates/stdlib/src/locale.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,34 @@ mod _locale {
locale: OptionalArg<Option<PyStrRef>>,
}

/// Maximum code page encoding name length on Windows
#[cfg(windows)]
const MAX_CP_LEN: usize = 15;

/// Check if the encoding part of a locale string is too long (Windows only)
#[cfg(windows)]
fn check_locale_name(locale: &str) -> bool {
if let Some(dot_pos) = locale.find('.') {
let encoding_part = &locale[dot_pos + 1..];
// Find the end of encoding (could be followed by '@' modifier)
let encoding_len = encoding_part.find('@').unwrap_or(encoding_part.len());
encoding_len <= MAX_CP_LEN
} else {
true
}
}

/// Check locale names for LC_ALL (handles semicolon-separated locales)
#[cfg(windows)]
fn check_locale_name_all(locale: &str) -> bool {
for part in locale.split(';') {
if !check_locale_name(part) {
return false;
}
}
true
}

#[pyfunction]
fn setlocale(args: LocaleArgs, vm: &VirtualMachine) -> PyResult {
let error = error(vm);
Expand All @@ -208,6 +236,21 @@ mod _locale {
let result = match args.locale.flatten() {
None => libc::setlocale(args.category, ptr::null()),
Some(locale) => {
// On Windows, validate encoding name length
#[cfg(windows)]
{
let valid = if args.category == LC_ALL {
check_locale_name_all(locale.as_str())
} else {
check_locale_name(locale.as_str())
};
if !valid {
return Err(vm.new_exception_msg(
error,
String::from("unsupported locale setting"),
));
}
}
let c_locale: CString =
CString::new(locale.as_str()).map_err(|e| e.to_pyexception(vm))?;
libc::setlocale(args.category, c_locale.as_ptr())
Expand Down
Loading