Skip to content

posix.pathconf_names #4571

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
merged 4 commits into from
Feb 27, 2023
Merged

posix.pathconf_names #4571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c88248a
Refactor posix.pathconf_names
youknowone Feb 25, 2023
1e09c63
try macos again
youknowone Feb 25, 2023
e25b89d
assert errno() == 0 before pathconf
youknowone Feb 27, 2023
fcacdb2
macos test for pathconf_names
youknowone Feb 27, 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
8 changes: 6 additions & 2 deletions extra_tests/snippets/stdlib_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
23 changes: 10 additions & 13 deletions vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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())
Expand All @@ -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
}
Expand Down