Implement dir_fd in os.open #2515
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now pass `test_posix.py PosixTester.test_open_dir_fd` Implement `dir_fd` in `make_path` and `os.open(path, flags, mode=0o777, *, dir_fd=None)`
kenkoooo
reviewed
Mar 13, 2021
vm/src/stdlib/os.rs
Outdated
| return Ok(path.into_os_string()); | ||
| } | ||
|
|
||
| if cfg!(target_os = "wasi") { |
There was a problem hiding this comment.
I guess we can use cfg_if! here.
There was a problem hiding this comment.
Use cfg_if! in cdcc191
|
Related to #1175 |
|
@coolreader18 Sorry for pinging you out of nowhere but could you please take a look at this? Is there anything I could change to make this better? Thanks in advanced. |
coolreader18
requested changes
Mar 15, 2021
vm/src/stdlib/os.rs
Outdated
| ) -> PyResult<std::borrow::Cow<'a, ffi::OsStr>> { | ||
| let path = &path.path; | ||
| if dir_fd.0.is_none() | path.is_absolute() { | ||
| return Ok(std::borrow::Cow::Borrowed(path.as_os_str().into())); |
There was a problem hiding this comment.
It looks like the unnecessary .into() here is causing the CI failure
vm/src/stdlib/os.rs
Outdated
| } | ||
|
|
||
| cfg_if::cfg_if! { | ||
| if #[cfg(target_os = "wasi")] { |
There was a problem hiding this comment.
Also, the cfgs you added here should match the cfg in Cargo.toml
vm/src/stdlib/os.rs
Outdated
| Ok(path.path.as_os_str()) | ||
| ) -> PyResult<std::borrow::Cow<'a, ffi::OsStr>> { | ||
| let path = &path.path; | ||
| if dir_fd.0.is_none() | path.is_absolute() { |
There was a problem hiding this comment.
Suggested change
| if dir_fd.0.is_none() | path.is_absolute() { | |
| if dir_fd.0.is_none() || path.is_absolute() { |
coolreader18
approved these changes
Mar 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now pass
test_posix.py PosixTester.test_open_dir_fdImplement dir_fd in
make_pathandos.open(path, flags, mode=0o777, *, dir_fd=None)