Skip to content

Add encoding="locale" support for TextIOWrapper #4781

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
Mar 28, 2023
Merged

Add encoding="locale" support for TextIOWrapper #4781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48ca28
Add utf8_mode field to Settings and make Flags to reference it for init
MegasKomnenos Mar 26, 2023
7e6c331
Add encoding='locale' support for TextIOWrapper
MegasKomnenos Mar 26, 2023
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
4 changes: 0 additions & 4 deletions Lib/test/test_fileinput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ def test__getitem__(self):
retval2 = fi[1]
self.assertEqual(retval2, "line2\n")

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test__getitem___deprecation(self):
t = self.writeTmp("line1\nline2\n")
with self.assertWarnsRegex(DeprecationWarning,
Expand Down Expand Up @@ -914,8 +912,6 @@ def test_empty_string(self):
def test_no_ext(self):
self.do_test_use_builtin_open("abcd", 2)

# TODO: RUSTPYTHON
@unittest.expectedFailure
@unittest.skipUnless(gzip, "Requires gzip and zlib")
def test_gz_ext_fake(self):
original_open = gzip.open
Expand Down
12 changes: 8 additions & 4 deletions vm/src/stdlib/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,10 +2193,14 @@ mod _io {
*data = None;

let encoding = match args.encoding {
Some(enc) => enc,
None => {
// TODO: try os.device_encoding(fileno) and then locale.getpreferredencoding()
PyStr::from(crate::codecs::DEFAULT_ENCODING).into_ref(&vm.ctx)
None if vm.state.settings.utf8_mode > 0 => PyStr::from("utf-8").into_ref(&vm.ctx),
Some(enc) if enc.as_str() != "locale" => enc,
_ => {
// None without utf8_mode or "locale" encoding
vm.import("locale", None, 0)?
.get_attr("getencoding", vm)?
.call((), vm)?
.try_into_value(vm)?
}
};

Expand Down
2 changes: 1 addition & 1 deletion vm/src/stdlib/sys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ mod sys {
hash_randomization: settings.hash_seed.is_none() as u8,
isolated: settings.isolated as u8,
dev_mode: settings.dev_mode,
utf8_mode: 1,
utf8_mode: settings.utf8_mode,
int_max_str_digits: -1,
safe_path: false,
warn_default_encoding: settings.warn_default_encoding as u8,
Expand Down
3 changes: 3 additions & 0 deletions vm/src/vm/setting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ pub struct Settings {
/// false for wasm. Not a command-line option
pub allow_external_library: bool,

pub utf8_mode: u8,

#[cfg(feature = "flame-it")]
pub profile_output: Option<OsString>,
#[cfg(feature = "flame-it")]
Expand Down Expand Up @@ -107,6 +109,7 @@ impl Default for Settings {
stdio_unbuffered: false,
check_hash_based_pycs: "default".to_owned(),
allow_external_library: cfg!(feature = "importlib"),
utf8_mode: 1,
#[cfg(feature = "flame-it")]
profile_output: None,
#[cfg(feature = "flame-it")]
Expand Down