Merge pull request RustPython#3560 from deantvv/os-device-encoding-wasi

coolreader18 · web-flow · commit 35cd72094942 · 2022-02-24T22:51:02.000-06:00
os: add `device_encoding` to wasi
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -48,7 +48,7 @@ hexf-parse = "0.2.1"
 indexmap = "1.0.2"
 ahash = "0.7.2"
 bitflags = "1.3"
-libc = "0.2.107"
+libc = "0.2.119"
 nix = "0.23"
 paste = "1.0.5"
 is-macro = "0.1"
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -1700,8 +1700,6 @@ pub(super) mod _os {
         }
     }
 
-    // TODO: libc currently doesn't support nl_langinfo in wasi
-    #[cfg(not(target_os = "wasi"))]
     #[pyfunction]
     fn device_encoding(fd: i32, _vm: &VirtualMachine) -> PyResult<Option<String>> {
         if !isatty(fd) {

Original file line number	Diff line number	Diff line change
`@@ -1700,8 +1700,6 @@ pub(super) mod _os {`
`1700`	`1700`	`}`
`1701`	`1701`	`}`
`1702`	`1702`
`1703`		`- // TODO: libc currently doesn't support nl_langinfo in wasi`
`1704`		`- #[cfg(not(target_os = "wasi"))]`
`1705`	`1703`	`#[pyfunction]`
`1706`	`1704`	`fn device_encoding(fd: i32, _vm: &VirtualMachine) -> PyResult<Option<String>> {`
`1707`	`1705`	`if !isatty(fd) {`