Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Pathconf names #4508

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.

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 2 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions 7 extra_tests/snippets/stdlib_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,10 @@ def __exit__(self, exc_type, exc_val, exc_tb):

for arg in [None, 1, 1.0, TabError]:
assert_raises(TypeError, os.system, arg)

# Testing for os.pathconf_names
if sys.platform.startswith('linux'):
assert len(os.pathconf_names) > 0
assert 'PC_NAME_MAX' in os.pathconf_names
for option,index in os.pathconf_names.items():
assert os.pathconf('/', index) == os.pathconf('/', option)
24 changes: 22 additions & 2 deletions 24 vm/src/stdlib/posix.rs
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;
use strum_macros::{EnumString, EnumVariantNames};

#[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)]
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, EnumString, EnumVariantNames)]
#[repr(i32)]
#[allow(non_camel_case_types)]
pub enum PathconfVar {
Expand Down Expand Up @@ -1881,6 +1881,26 @@ pub mod module {
pathconf(PathOrFd::Fd(fd), name, vm)
}

// TODO: this is expected to be run on macOS as a unix, but somehow not.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put linux cfg until it is fixed for macos

#[cfg(target_os = "linux")]
#[pyattr]
fn pathconf_names(vm: &VirtualMachine) -> PyDictRef {
use std::str::FromStr;
use strum::VariantNames;
let pathname = vm.ctx.new_dict();
for variant in PathconfVar::VARIANTS {
// get the name of variant as a string to use as the dictionary key
let key = vm.ctx.new_str(variant.to_string());
// 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();
}
pathname
}

#[cfg(any(target_os = "linux", target_os = "macos"))]
#[derive(FromArgs)]
struct SendFileArgs {
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.