Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1682e5d7
Commit
1682e5d7
authored
May 10, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #14157: Fix time.strptime failing without a year on February 29th.
Patch by Hynek Schlawack.
parent
a9494f6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
Lib/_strptime.py
Lib/_strptime.py
+5
-1
Lib/test/test_strptime.py
Lib/test/test_strptime.py
+3
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/_strptime.py
View file @
1682e5d7
...
...
@@ -339,7 +339,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
raise ValueError("
unconverted
data
remains
:
%
s
" %
data_string[found.end():])
year =
1900
year =
None
month = day = 1
hour = minute = second = fraction = 0
tz = -1
...
...
@@ -444,6 +444,10 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
else:
tz = value
break
if year is None and month == 2 and day == 29:
year = 1904 # 1904 is first leap year of 20th century
elif year is None:
year = 1900
# If we know the week of the year and what day of that week, we can figure
# out the Julian day of the year.
if julian == -1 and week_of_year != -1 and weekday != -1:
...
...
Lib/test/test_strptime.py
View file @
1682e5d7
...
...
@@ -378,6 +378,9 @@ class StrptimeTests(unittest.TestCase):
need_escaping = "
.
^
$
*+
?
{}
\
[]
|
)(
"
self.assertTrue(_strptime._strptime_time(need_escaping, need_escaping))
def test_feb29_on_leap_year_without_year(self):
time.strptime("
Feb
29
", "
%
b
%
d
")
class Strptime12AMPMTests(unittest.TestCase):
"""Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""
...
...
Misc/NEWS
View file @
1682e5d7
...
...
@@ -63,6 +63,9 @@ Core and Builtins
Library
-------
- Issue #14157: Fix time.strptime failing without a year on February 29th.
Patch by Hynek Schlawack.
- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'.
- Issue #14741: Fix missing support for Ellipsis ('...') in parser module.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment