mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Make _strptime escape regex syntax in format string to prevent use in internal regex.
This commit is contained in:
parent
482c5f7eb7
commit
1e91d8eb03
2 changed files with 24 additions and 1 deletions
|
@ -168,6 +168,14 @@ class TimeRETests(unittest.TestCase):
|
|||
"did not find 'd' directive pattern string '%s'" %
|
||||
pattern_string)
|
||||
|
||||
def test_pattern_escaping(self):
|
||||
# Make sure any characters in the format string that might be taken as
|
||||
# regex syntax is escaped.
|
||||
pattern_string = self.time_re.pattern("\d+")
|
||||
self.failUnless(r"\\d\+" in pattern_string,
|
||||
"%s does not have re characters escaped properly" %
|
||||
pattern_string)
|
||||
|
||||
def test_compile(self):
|
||||
# Check that compiled regex is correct
|
||||
found = self.time_re.compile(r"%A").match(self.locale_time.f_weekday[6])
|
||||
|
@ -201,6 +209,12 @@ class TimeRETests(unittest.TestCase):
|
|||
self.failUnless(_strptime.TimeRE(test_locale).pattern("%Z") == '',
|
||||
"with timezone == ('',''), TimeRE().pattern('%Z') != ''")
|
||||
|
||||
def test_matching_with_escapes(self):
|
||||
# Make sure a format that requires escaping of characters works
|
||||
compiled_re = self.time_re.compile("\w+ %m")
|
||||
found = compiled_re.match("\w+ 10")
|
||||
self.failUnless(found, "Escaping failed of format '\w+ 10'")
|
||||
|
||||
class StrptimeTests(unittest.TestCase):
|
||||
"""Tests for _strptime.strptime."""
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue