Skip to content

Fix windows socket #6408

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 12, 2025
Merged

Fix windows socket #6408

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
a23e99c
fix _path_splitroot
youknowone Dec 11, 2025
d5fb695
Fix windows socket
youknowone Dec 12, 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
Next Next commit
fix _path_splitroot
  • Loading branch information
@youknowone
youknowone committed Dec 12, 2025
commit a23e99c2497b08ac8e0911dbcd635a05abd9e26f
1 change: 0 additions & 1 deletion Lib/test/test_zipimport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ def testTraceback(self):

@unittest.skipIf(os_helper.TESTFN_UNENCODABLE is None,
"need an unencodable filename")
@unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
def testUnencodable(self):
filename = os_helper.TESTFN_UNENCODABLE + ".zip"
self.addCleanup(os_helper.unlink, filename)
Expand Down
28 changes: 17 additions & 11 deletions crates/vm/src/stdlib/nt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,10 +1122,18 @@ pub(crate) mod module {
}

#[pyfunction]
fn _path_splitroot(path: OsPath, vm: &VirtualMachine) -> PyResult<(String, String)> {
fn _path_splitroot(
path: OsPath,
_vm: &VirtualMachine,
) -> (
rustpython_common::wtf8::Wtf8Buf,
rustpython_common::wtf8::Wtf8Buf,
) {
use rustpython_common::wtf8::Wtf8Buf;

let orig: Vec<_> = path.path.to_wide();
if orig.is_empty() {
return Ok(("".to_owned(), "".to_owned()));
return (Wtf8Buf::new(), Wtf8Buf::new());
}
let backslashed: Vec<_> = orig
.iter()
Expand All @@ -1134,15 +1142,11 @@ pub(crate) mod module {
.chain(std::iter::once(0)) // null-terminated
.collect();

fn from_utf16(wstr: &[u16], vm: &VirtualMachine) -> PyResult<String> {
String::from_utf16(wstr).map_err(|e| vm.new_unicode_decode_error(e.to_string()))
}

let mut end: *const u16 = std::ptr::null();
let hr = unsafe {
windows_sys::Win32::UI::Shell::PathCchSkipRoot(backslashed.as_ptr(), &mut end)
};
let (root, path) = if hr == 0 {
if hr == 0 {
// S_OK
assert!(!end.is_null());
let len: usize = unsafe { end.offset_from(backslashed.as_ptr()) }
Expand All @@ -1155,11 +1159,13 @@ pub(crate) mod module {
len,
backslashed.len()
);
(from_utf16(&orig[..len], vm)?, from_utf16(&orig[len..], vm)?)
(
Wtf8Buf::from_wide(&orig[..len]),
Wtf8Buf::from_wide(&orig[len..]),
)
} else {
("".to_owned(), from_utf16(&orig, vm)?)
};
Ok((root, path))
(Wtf8Buf::new(), Wtf8Buf::from_wide(&orig))
}
}

#[pyfunction]
Expand Down