diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-14 17:45:27 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-14 17:45:27 (GMT) |
| commit | e2eab5e768ca7bd44788ec6c499cf12e9fa52435 (patch) | |
| tree | 3b98b5178a7ab06a7ccc14b18fe748a028b97cee /Lib/_strptime.py | |
| parent | 4043d3dee28c4257c7bf27f0a581a2212665066f (diff) | |
| parent | 072e4a3fc7cdca935309b713a01ea1c318a95508 (diff) | |
| download | cpython-e2eab5e768ca7bd44788ec6c499cf12e9fa52435.zip cpython-e2eab5e768ca7bd44788ec6c499cf12e9fa52435.tar.gz cpython-e2eab5e768ca7bd44788ec6c499cf12e9fa52435.tar.bz2 | |
Followup to issue #14157: respect the relative ordering of values produced by time.strptime().
Patch by Hynek.
Diffstat (limited to 'Lib/_strptime.py')
| -rw-r--r-- | Lib/_strptime.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py index 0106e91..fa06376 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -444,8 +444,10 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): else: tz = value break + leap_year_fix = False if year is None and month == 2 and day == 29: year = 1904 # 1904 is first leap year of 20th century + leap_year_fix = True elif year is None: year = 1900 # If we know the week of the year and what day of that week, we can figure @@ -476,6 +478,12 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): else: gmtoff = None + if leap_year_fix: + # the caller didn't supply a year but asked for Feb 29th. We couldn't + # use the default of 1900 for computations. We set it back to ensure + # that February 29th is smaller than March 1st. + year = 1900 + return (year, month, day, hour, minute, second, weekday, julian, tz, gmtoff, tzname), fraction |