Content-Length: 358871 | pFad | http://github.com/RustPython/RustPython/pull/5523/files

F5 Extend time compat for windows by arihant2math · Pull Request #5523 · RustPython/RustPython · GitHub
Skip to content

Extend time compat for windows #5523

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 6 commits into from
Feb 18, 2025
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
1 change: 1 addition & 0 deletions vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ features = [
"Win32_Foundation",
"Win32_System_LibraryLoader",
"Win32_System_Threading",
"Win32_System_Time",
"Win32_UI_Shell",
]

Expand Down
46 changes: 46 additions & 0 deletions vm/src/stdlib/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ mod decl {
DateTime, Datelike, Timelike,
};
use std::time::Duration;
#[cfg(target_env = "msvc")]
#[cfg(not(target_arch = "wasm32"))]
use windows::Win32::System::Time;

#[allow(dead_code)]
pub(super) const SEC_TO_MS: i64 = 1000;
Expand Down Expand Up @@ -152,6 +155,15 @@ mod decl {
Ok(get_perf_time(vm)?.as_nanos())
}

#[cfg(target_env = "msvc")]
#[cfg(not(target_arch = "wasm32"))]
fn get_tz_info() -> Time::TIME_ZONE_INFORMATION {
let mut info = Time::TIME_ZONE_INFORMATION::default();
let info_ptr = &mut info as *mut Time::TIME_ZONE_INFORMATION;
let _ = unsafe { Time::GetTimeZoneInformation(info_ptr) };
info
}

// #[pyfunction]
// fn tzset() {
// unsafe { super::_tzset() };
Expand All @@ -164,6 +176,15 @@ mod decl {
unsafe { super::c_timezone }
}

#[cfg(target_env = "msvc")]
#[cfg(not(target_arch = "wasm32"))]
#[pyattr]
fn timezone(_vm: &VirtualMachine) -> i32 {
let info = get_tz_info();
// https://users.rust-lang.org/t/accessing-tzname-and-similar-constants-in-windows/125771/3
(info.Bias + info.StandardBias) * 60
}

#[cfg(not(target_os = "freebsd"))]
#[cfg(not(target_env = "msvc"))]
#[cfg(not(target_arch = "wasm32"))]
Expand All @@ -172,6 +193,15 @@ mod decl {
unsafe { super::c_daylight }
}

#[cfg(target_env = "msvc")]
#[cfg(not(target_arch = "wasm32"))]
#[pyattr]
fn daylight(_vm: &VirtualMachine) -> i32 {
let info = get_tz_info();
// https://users.rust-lang.org/t/accessing-tzname-and-similar-constants-in-windows/125771/3
(info.StandardBias != info.DaylightBias) as i32
}

#[cfg(not(target_env = "msvc"))]
#[cfg(not(target_arch = "wasm32"))]
#[pyattr]
Expand All @@ -184,6 +214,22 @@ mod decl {
unsafe { (to_str(super::c_tzname[0]), to_str(super::c_tzname[1])) }.into_pytuple(vm)
}

#[cfg(target_env = "msvc")]
#[cfg(not(target_arch = "wasm32"))]
#[pyattr]
fn tzname(vm: &VirtualMachine) -> crate::builtins::PyTupleRef {
use crate::builtins::tuple::IntoPyTuple;
let info = get_tz_info();
let standard = widestring::decode_utf16_lossy(info.StandardName)
.filter(|&c| c != '\0')
.collect::<String>();
let daylight = widestring::decode_utf16_lossy(info.DaylightName)
.filter(|&c| c != '\0')
.collect::<String>();
let tz_name = (&*standard, &*daylight);
tz_name.into_pytuple(vm)
}

fn pyobj_to_date_time(
value: Either<f64, i64>,
vm: &VirtualMachine,
Expand Down
Loading








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/RustPython/RustPython/pull/5523/files

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy