Merge pull request #4571 from youknowone/posix-pathconf_names

youknowone · web-flow · commit 351d46444860 · 2023-02-27T15:06:51.000+09:00
posix.pathconf_names
diff --git a/extra_tests/snippets/stdlib_os.py b/extra_tests/snippets/stdlib_os.py
@@ -509,8 +509,12 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         assert_raises(TypeError, os.system, arg)
 
 # Testing for os.pathconf_names
-if sys.platform.startswith('linux'):
+if not sys.platform.startswith('win'):
     assert len(os.pathconf_names) > 0
     assert 'PC_NAME_MAX' in os.pathconf_names
-    for option,index in os.pathconf_names.items():
+    for option, index in os.pathconf_names.items():
+        if sys.platform == "darwin":
+            # TODO: check why it fails
+            if option in ["PC_MAX_CANON", "PC_MAX_INPUT", "PC_VDISABLE"]:
+                continue
         assert os.pathconf('/', index) == os.pathconf('/', option)
diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
@@ -51,7 +51,7 @@ pub mod module {
         fs, io,
         os::unix::{ffi as ffi_ext, io::RawFd},
     };
-    use strum_macros::{EnumString, EnumVariantNames};
+    use strum_macros::{EnumIter, EnumString};
 
     #[pyattr]
     use libc::{PRIO_PGRP, PRIO_PROCESS, PRIO_USER};
@@ -1681,7 +1681,7 @@ pub mod module {
 
     // Copy from [nix::unistd::PathconfVar](https://docs.rs/nix/0.21.0/nix/unistd/enum.PathconfVar.html)
     // Change enum name to fit python doc
-    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, EnumString, EnumVariantNames)]
+    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, EnumIter, EnumString)]
     #[repr(i32)]
     #[allow(non_camel_case_types)]
     pub enum PathconfVar {
@@ -1856,6 +1856,7 @@ pub mod module {
         use nix::errno::{self, Errno};
 
         Errno::clear();
+        debug_assert_eq!(errno::errno(), 0);
         let raw = match path {
             PathOrFd::Path(path) => {
                 let path = CString::new(path.into_bytes())
@@ -1881,22 +1882,18 @@ pub mod module {
         pathconf(PathOrFd::Fd(fd), name, vm)
     }
 
-    // TODO: this is expected to be run on macOS as a unix, but somehow not.
-    #[cfg(target_os = "linux")]
     #[pyattr]
     fn pathconf_names(vm: &VirtualMachine) -> PyDictRef {
-        use std::str::FromStr;
-        use strum::VariantNames;
+        use strum::IntoEnumIterator;
         let pathname = vm.ctx.new_dict();
-        for variant in PathconfVar::VARIANTS {
+        for variant in PathconfVar::iter() {
             // get the name of variant as a string to use as the dictionary key
-            let key = vm.ctx.new_str(variant.to_string());
+            let key = vm.ctx.new_str(format!("{:?}", variant));
             // get the enum from the string and convert it to an integer for the dictionary value
-            let value: PyObjectRef = vm
-                .ctx
-                .new_int(PathconfVar::from_str(variant).unwrap() as u8)
-                .into();
-            pathname.set_item(&*key, value, vm).unwrap();
+            let value = vm.ctx.new_int(variant as u8);
+            pathname
+                .set_item(&*key, value.into(), vm)
+                .expect("dict set_item unexpectedly failed");
         }
         pathname
     }
