Skip to content

Commit 933912a

Browse files
youknowoneyouknowone
committed
Fix Windows non-unix time module regressions
- Remove mday.clamp(1, 28) and mon.clamp(1, 12) from to_date_time() which was incorrectly truncating valid dates (e.g. Dec 31 → Dec 28) - Fix gmtime non-unix to use UTC conversion instead of local - Restructure non-unix strftime to catch to_date_time errors gracefully - Add expectedFailure markers for Windows-only chrono limitations in test_time.py (month=0, big years, negative year formatting, surrogates)
1 parent 128936d commit 933912a

File tree

2 files changed

+54
-36
lines changed

2 files changed

+54
-36
lines changed

‎Lib/test/test_time.py‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ def test_strftime_invalid_format(self):
208208
except ValueError as exc:
209209
self.assertEqual(str(exc), 'Invalid format string')
210210

211+
# TODO: RUSTPYTHON; chrono fallback on Windows does not preserve surrogates
212+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
211213
def test_strftime_special(self):
212214
tt = time.gmtime(self.t)
213215
s1 = time.strftime('%c', tt)
@@ -292,6 +294,8 @@ def _bounds_checking(self, func):
292294
self.assertRaises(ValueError, func,
293295
(1900, 1, 1, 0, 0, 0, 0, 367, -1))
294296

297+
# TODO: RUSTPYTHON; chrono on Windows rejects month=0/day=0 and raises wrong error type
298+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
295299
def test_strftime_bounding_check(self):
296300
self._bounds_checking(lambda tup: time.strftime('', tup))
297301

@@ -308,6 +312,8 @@ def test_strftime_format_check(self):
308312
except ValueError:
309313
pass
310314

315+
# TODO: RUSTPYTHON; chrono on Windows does not handle month=0/day=0 in struct_time
316+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
311317
def test_default_values_for_zero(self):
312318
# Make sure that using all zeros uses the proper default
313319
# values. No test for daylight savings since strftime() does
@@ -318,6 +324,8 @@ def test_default_values_for_zero(self):
318324
result = time.strftime("%Y %m %d %H %M %S %w %j", (2000,)+(0,)*8)
319325
self.assertEqual(expected, result)
320326

327+
# TODO: RUSTPYTHON; chrono %Z on Windows not compatible with strptime
328+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
321329
@skip_if_buggy_ucrt_strfptime
322330
def test_strptime(self):
323331
# Should be able to go round-trip from strftime to strptime without
@@ -357,6 +365,8 @@ def test_strptime_leap_year(self):
357365
r'.*day of month without a year.*'):
358366
time.strptime('02-07 18:28', '%m-%d %H:%M')
359367

368+
# TODO: RUSTPYTHON; chrono on Windows cannot handle month=0/big years
369+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
360370
def test_asctime(self):
361371
time.asctime(time.gmtime(self.t))
362372

@@ -372,9 +382,13 @@ def test_asctime(self):
372382
self.assertRaises(TypeError, time.asctime, ())
373383
self.assertRaises(TypeError, time.asctime, (0,) * 10)
374384

385+
# TODO: RUSTPYTHON; chrono on Windows rejects month=0/day=0
386+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
375387
def test_asctime_bounding_check(self):
376388
self._bounds_checking(time.asctime)
377389

390+
# TODO: RUSTPYTHON; chrono on Windows formats negative years differently
391+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
378392
def test_ctime(self):
379393
t = time.mktime((1973, 9, 16, 1, 3, 52, 0, 0, -1))
380394
self.assertEqual(time.ctime(t), 'Sun Sep 16 01:03:52 1973')
@@ -495,6 +509,8 @@ def test_localtime_without_arg(self):
495509
t1 = time.mktime(lt1)
496510
self.assertAlmostEqual(t1, t0, delta=0.2)
497511

512+
# TODO: RUSTPYTHON; chrono on Windows mktime round-trip fails for negative timestamps
513+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
498514
def test_mktime(self):
499515
# Issue #1726687
500516
for t in (-2, -1, 0, 1):
@@ -747,13 +763,22 @@ def test_negative(self):
747763

748764

749765
class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear, unittest.TestCase):
750-
pass
766+
# TODO: RUSTPYTHON; chrono on Windows cannot handle month=0/day=0 in struct_time
767+
if sys.platform == "win32":
768+
test_year = unittest.expectedFailure(lambda self: _Test4dYear.test_year(self))
769+
test_large_year = unittest.expectedFailure(lambda self: _Test4dYear.test_large_year(self))
770+
test_negative = unittest.expectedFailure(lambda self: _Test4dYear.test_negative(self))
751771

752772
class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear, unittest.TestCase):
753-
pass
773+
# TODO: RUSTPYTHON; chrono on Windows cannot handle month=0/day=0 in struct_time
774+
if sys.platform == "win32":
775+
test_large_year = unittest.expectedFailure(lambda self: _TestStrftimeYear.test_large_year(self))
776+
test_negative = unittest.expectedFailure(lambda self: _TestStrftimeYear.test_negative(self))
754777

755778

756779
class TestPytime(unittest.TestCase):
780+
# TODO: RUSTPYTHON; chrono %Z on Windows gives offset instead of timezone name
781+
@unittest.expectedFailureIf(sys.platform == "win32", "TODO: RUSTPYTHON")
757782
@skip_if_buggy_ucrt_strfptime
758783
@unittest.skipUnless(time._STRUCT_TM_ITEMS == 11, "needs tm_zone support")
759784
def test_localtime_timezone(self):

‎crates/vm/src/stdlib/time.rs‎

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,12 @@ mod decl {
488488

489489
#[cfg(not(unix))]
490490
{
491-
let instant = secs.naive_or_local(vm)?;
491+
let instant = match secs {
492+
OptionalArg::Present(Some(secs)) => pyobj_to_date_time(secs, vm)?.naive_utc(),
493+
OptionalArg::Present(None) | OptionalArg::Missing => {
494+
chrono::offset::Utc::now().naive_utc()
495+
}
496+
};
492497
Ok(StructTimeData::new_utc(vm, instant))
493498
}
494499
}
@@ -656,34 +661,29 @@ mod decl {
656661
}
657662

658663
#[cfg(not(unix))]
659-
use core::fmt::Write;
660-
661-
#[cfg(not(unix))]
662-
let instant = t.naive_or_local(vm)?;
664+
{
665+
use core::fmt::Write;
663666

664-
#[cfg(not(unix))]
665-
let fmt_lossy = format.to_string_lossy();
667+
let fmt_lossy = format.to_string_lossy();
666668

667-
// On Windows/AIX/Solaris, %y format with year < 1900 is not supported
668-
#[cfg(any(windows, target_os = "aix", target_os = "solaris"))]
669-
if instant.year() < 1900 && fmt_lossy.contains("%y") {
670-
let msg = "format %y requires year >= 1900 on Windows";
671-
return Err(vm.new_value_error(msg.to_owned()));
672-
}
669+
// If the struct_time can't be represented as NaiveDateTime
670+
// (e.g. month=0), return the format string as-is, matching
671+
// the fallback behavior for unsupported chrono formats.
672+
let instant = match t.naive_or_local(vm) {
673+
Ok(dt) => dt,
674+
Err(_) => return Ok(vm.ctx.new_str(fmt_lossy.into_owned()).into()),
675+
};
673676

674-
#[cfg(not(unix))]
675-
let mut formatted_time = String::new();
677+
// On Windows/AIX/Solaris, %y format with year < 1900 is not supported
678+
#[cfg(any(windows, target_os = "aix", target_os = "solaris"))]
679+
if instant.year() < 1900 && fmt_lossy.contains("%y") {
680+
let msg = "format %y requires year >= 1900 on Windows";
681+
return Err(vm.new_value_error(msg.to_owned()));
682+
}
676683

677-
/*
678-
* chrono doesn't support all formats and it
679-
* raises an error if unsupported format is supplied.
680-
* If error happens, we set result as input arg.
681-
*/
682-
#[cfg(not(unix))]
683-
write!(&mut formatted_time, "{}", instant.format(&fmt_lossy))
684-
.unwrap_or_else(|_| formatted_time = format.to_string());
685-
#[cfg(not(unix))]
686-
{
684+
let mut formatted_time = String::new();
685+
write!(&mut formatted_time, "{}", instant.format(&fmt_lossy))
686+
.unwrap_or_else(|_| formatted_time = format.to_string());
687687
Ok(vm.ctx.new_str(formatted_time).into())
688688
}
689689
}
@@ -850,16 +850,9 @@ mod decl {
850850
self.$field.clone().try_into_value(vm)?
851851
};
852852
}
853-
let year: i32 = field!(tm_year);
854-
let mon: u32 = field!(tm_mon);
855-
let mday: u32 = field!(tm_mday);
856-
// C strftime accepts out-of-range month/day values, but chrono
857-
// requires valid dates. Clamp to valid ranges so that format
858-
// directives like %Y still work with unusual struct_time values.
859-
let mon = mon.clamp(1, 12);
860-
let mday = mday.clamp(1, 28);
861853
let dt = NaiveDateTime::new(
862-
NaiveDate::from_ymd_opt(year, mon, mday).ok_or_else(invalid_value)?,
854+
NaiveDate::from_ymd_opt(field!(tm_year), field!(tm_mon), field!(tm_mday))
855+
.ok_or_else(invalid_value)?,
863856
NaiveTime::from_hms_opt(field!(tm_hour), field!(tm_min), field!(tm_sec))
864857
.ok_or_else(invalid_overflow)?,
865858
);

0 commit comments

Comments
 (0)