Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix time (#6330)

Browse Source
This commit is contained in:
Jeong, YunWon
2025-12-06 08:30:57 +09:00
committed by GitHub
parent c826f9d809
commit 89bcae7bea
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
crates/vm/src/stdlib/time.rs
View File

@@ -311,7 +311,7 @@ mod decl {
vm: &VirtualMachine,
) -> PyResult<StructTimeData> {
let instant = secs.naive_or_utc(vm)?;
Ok(StructTimeData::new(vm, instant, 0))
Ok(StructTimeData::new_utc(vm, instant))
}
#[pyfunction]
@@ -322,7 +322,7 @@ mod decl {
let instant = secs.naive_or_local(vm)?;
// TODO: isdst flag must be valid value here
// https://docs.python.org/3/library/time.html#time.localtime
Ok(StructTimeData::new(vm, instant, -1))
Ok(StructTimeData::new_local(vm, instant, -1))
}
#[pyfunction]
@@ -500,12 +500,13 @@ mod decl {
}
impl StructTimeData {
fn new(vm: &VirtualMachine, tm: NaiveDateTime, isdst: i32) -> Self {
let local_time = chrono::Local.from_local_datetime(&tm).unwrap();
let offset_seconds =
local_time.offset().local_minus_utc() + if isdst == 1 { 3600 } else { 0 };
let tz_abbr = local_time.format("%Z").to_string();
fn new_inner(
vm: &VirtualMachine,
tm: NaiveDateTime,
isdst: i32,
gmtoff: i32,
zone: &str,
) -> Self {
Self {
tm_year: vm.ctx.new_int(tm.year()).into(),
tm_mon: vm.ctx.new_int(tm.month()).into(),
@@ -516,11 +517,25 @@ mod decl {
tm_wday: vm.ctx.new_int(tm.weekday().num_days_from_monday()).into(),
tm_yday: vm.ctx.new_int(tm.ordinal()).into(),
tm_isdst: vm.ctx.new_int(isdst).into(),
tm_gmtoff: vm.ctx.new_int(offset_seconds).into(),
tm_zone: vm.ctx.new_str(tz_abbr).into(),
tm_gmtoff: vm.ctx.new_int(gmtoff).into(),
tm_zone: vm.ctx.new_str(zone).into(),
}
}
/// Create struct_time for UTC (gmtime)
fn new_utc(vm: &VirtualMachine, tm: NaiveDateTime) -> Self {
Self::new_inner(vm, tm, 0, 0, "UTC")
}
/// Create struct_time for local timezone (localtime)
fn new_local(vm: &VirtualMachine, tm: NaiveDateTime, isdst: i32) -> Self {
let local_time = chrono::Local.from_local_datetime(&tm).unwrap();
let offset_seconds =
local_time.offset().local_minus_utc() + if isdst == 1 { 3600 } else { 0 };
let tz_abbr = local_time.format("%Z").to_string();
Self::new_inner(vm, tm, isdst, offset_seconds, &tz_abbr)
}
fn to_date_time(&self, vm: &VirtualMachine) -> PyResult<NaiveDateTime> {
let invalid_overflow = || vm.new_overflow_error("mktime argument out of range");
let invalid_value = || vm.new_value_error("invalid struct_time parameter");