mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

FsPath::to_pathlike

Browse Source
This commit is contained in:
Jeong YunWon
2021-09-22 17:34:50 +09:00
parent f61b73cd3f
commit abc4b4196e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
vm/src/stdlib/os.rs
View File

@@ -123,12 +123,16 @@ impl FsPath {
FsPath::Bytes(b) => bytes_as_osstr(b.as_bytes(), vm),
}
}
fn to_output_mode(&self) -> OutputMode {
match self {
fn to_pathlike(&self, vm: &VirtualMachine) -> PyResult<PyPathLike> {
let path = self.as_os_str(vm)?.to_owned().into();
let mode = match self {
Self::Str(_) => OutputMode::String,
Self::Bytes(_) => OutputMode::Bytes,
}
};
Ok(PyPathLike { path, mode })
}
#[cfg(not(target_os = "redox"))]
pub(crate) fn as_bytes(&self) -> &[u8] {
// TODO: FS encodings
@@ -202,11 +206,8 @@ impl TryFromObject for PyPathLike {
Ok(buffer) => PyBytes::from(buffer.internal.obj_bytes().to_vec()).into_pyobject(vm),
Err(_) => obj,
};
let path = fspath(obj, true, vm)?;
Ok(Self {
path: path.as_os_str(vm)?.to_owned().into(),
mode: path.to_output_mode(),
})
let fs_path = fspath(obj, true, vm)?;
fs_path.to_pathlike(vm)
}
}
@@ -402,7 +403,7 @@ pub(super) mod _os {
use rustpython_common::lock::OnceCell;
const OPEN_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox")));
const MKDIR_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox")));
pub(crate) const MKDIR_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox")));
const STAT_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox")));
const UTIME_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox")));