Backport of r55752: make time.strptime() behave better when whitespace is in
the format arguments.
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 476f9d8..8b3e64f 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -253,7 +253,7 @@
regex_chars = re_compile(r"([\\.^$*+?\(\){}\[\]|])")
format = regex_chars.sub(r"\\\1", format)
whitespace_replacement = re_compile('\s+')
- format = whitespace_replacement.sub('\s*', format)
+ format = whitespace_replacement.sub('\s+', format)
while '%' in format:
directive_index = format.index('%')+1
processed_format = "%s%s%s" % (processed_format,
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index f474752..92c722a 100644
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -190,6 +190,15 @@
"locale data that contains regex metacharacters is not"
" properly escaped")
+ def test_whitespace_substitution(self):
+ # When pattern contains whitespace, make sure it is taken into account
+ # so as to not allow to subpatterns to end up next to each other and
+ # "steal" characters from each other.
+ pattern = self.time_re.pattern('%j %H')
+ self.failUnless(not re.match(pattern, "180"))
+ self.failUnless(re.match(pattern, "18 0"))
+
+
class StrptimeTests(unittest.TestCase):
"""Tests for _strptime.strptime."""
diff --git a/Misc/NEWS b/Misc/NEWS
index a397e4d..10bf25c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Library
-------
+- Bug #1730389: Have time.strptime() match spaces in a format argument with
+ ``\s+`` instead of ``\s*``.
+
- SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.