Skip to content

get_inheritable, dup for windows #6343

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
youknowone merged 2 commits into from
Dec 8, 2025
Merged

get_inheritable, dup for windows #6343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1115046
get_inheritable, dup for windows
youknowone Dec 7, 2025
388bf2b
fix dup
youknowone Dec 8, 2025
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
Prev Previous commit
fix dup
  • Loading branch information
@youknowone
youknowone committed Dec 8, 2025
commit 388bf2b58b0aeb2f35263d908da5357621a08c7f
1 change: 0 additions & 1 deletion Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,6 @@ def test_urandom_failure(self):
"""
assert_python_ok('-c', code)

@unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; on Windows (ModuleNotFoundError: No module named 'os')")
def test_urandom_fd_closed(self):
# Issue #21207: urandom() should reopen its fd to /dev/urandom if
# closed.
Expand Down
19 changes: 13 additions & 6 deletions crates/vm/src/stdlib/nt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyRef<PyModule> {
pub(crate) mod module {
use crate::{
PyResult, TryFromObject, VirtualMachine,
builtins::{PyDictRef, PyListRef, PyStrRef, PyTupleRef},
builtins::{PyBaseExceptionRef, PyDictRef, PyListRef, PyStrRef, PyTupleRef},
common::{crt_fd, os::last_os_error, suppress_iph},
convert::ToPyException,
function::{Either, OptionalArg},
Expand Down Expand Up @@ -488,6 +488,13 @@ pub(crate) mod module {
fn _dup2(fd: i32, fd2: i32) -> i32;
}

/// Close fd and convert error to PyException (PEP 446 cleanup)
#[cold]
fn close_fd_and_raise(fd: i32, err: std::io::Error, vm: &VirtualMachine) -> PyBaseExceptionRef {
let _ = unsafe { crt_fd::Owned::from_raw(fd) };
err.to_pyexception(vm)
}

#[pyfunction]
fn umask(mask: i32, vm: &VirtualMachine) -> PyResult<i32> {
let result = unsafe { _umask(mask) };
Expand All @@ -504,11 +511,10 @@ pub(crate) mod module {
if fd2 < 0 {
return Err(errno_err(vm));
}
// Set the new fd as non-inheritable
let borrowed = unsafe { crt_fd::Borrowed::borrow_raw(fd2) };
let handle = crt_fd::as_handle(borrowed).map_err(|e| e.to_pyexception(vm))?;
let handle = crt_fd::as_handle(borrowed).map_err(|e| close_fd_and_raise(fd2, e, vm))?;
raw_set_handle_inheritable(handle.as_raw_handle() as _, false)
.map_err(|e| e.to_pyexception(vm))?;
.map_err(|e| close_fd_and_raise(fd2, e, vm))?;
Ok(fd2)
}

Expand All @@ -530,9 +536,10 @@ pub(crate) mod module {
}
if !args.inheritable {
let borrowed = unsafe { crt_fd::Borrowed::borrow_raw(args.fd2) };
let handle = crt_fd::as_handle(borrowed).map_err(|e| e.to_pyexception(vm))?;
let handle =
crt_fd::as_handle(borrowed).map_err(|e| close_fd_and_raise(args.fd2, e, vm))?;
raw_set_handle_inheritable(handle.as_raw_handle() as _, false)
.map_err(|e| e.to_pyexception(vm))?;
.map_err(|e| close_fd_and_raise(args.fd2, e, vm))?;
}
Ok(args.fd2)
}
Expand Down
Loading