From 1682e5d74080d88109b3fc54e2ddfa762feb3e1d Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 10 May 2012 20:17:46 +0200
Subject: [PATCH] Issue #14157: Fix time.strptime failing without a year on
February 29th. Patch by Hynek Schlawack.
---
Lib/_strptime.py | 6 +++++-
Lib/test/test_strptime.py | 3 +++
Misc/NEWS | 3 +++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 0ea4c43111..0106e914ae 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -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:
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index 98d759b9f1..7245671a4c 100644
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -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)"""
diff --git a/Misc/NEWS b/Misc/NEWS
index c4901b02a7..42fc741933 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
--
2.40.0