[Python-checkins] r55752 - in python/trunk: Lib/_strptime.py Lib/test/test_strptime.py Misc/NEWS
brett.cannon
python-checkins at python.org
Mon Jun 4 01:13:46 CEST 2007
Author: brett.cannon
Date: Mon Jun 4 01:13:41 2007
New Revision: 55752
Modified:
python/trunk/Lib/_strptime.py
python/trunk/Lib/test/test_strptime.py
python/trunk/Misc/NEWS
Log:
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
Modified: python/trunk/Lib/_strptime.py
==============================================================================
--- python/trunk/Lib/_strptime.py (original)
+++ python/trunk/Lib/_strptime.py Mon Jun 4 01:13:41 2007
@@ -250,7 +250,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,
Modified: python/trunk/Lib/test/test_strptime.py
==============================================================================
--- python/trunk/Lib/test/test_strptime.py (original)
+++ python/trunk/Lib/test/test_strptime.py Mon Jun 4 01:13:41 2007
@@ -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."""
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Mon Jun 4 01:13:41 2007
@@ -222,6 +222,9 @@
Library
-------
+- Bug #1730389: Change time.strptime() to use ``\s+`` instead of ``\s*`` when
+ matching spaces in the specified format argument.
+
- SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
More information about the Python-checkins
mailing list