mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Followup to issue #14157: respect the relative ordering of values produced by time.strptime().

Browse Source 
Patch by Hynek.
This commit is contained in:
Antoine Pitrou 2012-05-14 19:44:59 +02:00
parent 2d82d049f6
commit 072e4a3fc7
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/_strptime.py
View File

@ -444,8 +444,10 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
else: else:
tz = value tz = value
break break
leap_year_fix = False
if year is None and month == 2 and day == 29: if year is None and month == 2 and day == 29:
year = 1904 # 1904 is first leap year of 20th century year = 1904 # 1904 is first leap year of 20th century
leap_year_fix = True
elif year is None: elif year is None:
year = 1900 year = 1900
# If we know the week of the year and what day of that week, we can figure # 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: else:
gmtoff = None 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, return (year, month, day,
hour, minute, second, hour, minute, second,
weekday, julian, tz, gmtoff, tzname), fraction weekday, julian, tz, gmtoff, tzname), fraction

5
Lib/test/test_strptime.py
View File

@ -381,6 +381,11 @@ class StrptimeTests(unittest.TestCase):
def test_feb29_on_leap_year_without_year(self): def test_feb29_on_leap_year_without_year(self):
time.strptime("Feb 29", "%b %d") time.strptime("Feb 29", "%b %d")
def test_mar1_comes_after_feb29_even_when_omitting_the_year(self):
self.assertLess(
time.strptime("Feb 29", "%b %d"),
time.strptime("Mar 1", "%b %d"))
class Strptime12AMPMTests(unittest.TestCase): class Strptime12AMPMTests(unittest.TestCase):
"""Test a _strptime regression in '%I %p' at 12 noon (12 PM)""" """Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""