mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make sure parentheses are escaped when used in the format string.

Browse source 
Closes bug #796149 .  Will be backported.
This commit is contained in:
Brett Cannon 2003-08-29 02:28:54 +00:00
parent 6676f6edc1
commit 953c6f508b
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/_strptime.py
View file

@ -249,7 +249,7 @@ class TimeRE(dict):
processed_format = '' processed_format = ''
# The sub() call escapes all characters that might be misconstrued # The sub() call escapes all characters that might be misconstrued
# as regex syntax. # as regex syntax.
regex_chars = re_compile(r"([\\.^$*+?{}\[\]|])") regex_chars = re_compile(r"([\\.^$*+?\(\){}\[\]|])")
format = regex_chars.sub(r"\\\1", format) format = regex_chars.sub(r"\\\1", format)
whitespace_replacement = re_compile('\s+') whitespace_replacement = re_compile('\s+')
format = whitespace_replacement.sub('\s*', format) format = whitespace_replacement.sub('\s*', format)

9
Lib/test/test_strptime.py
View file

@ -333,6 +333,15 @@ class StrptimeTests(unittest.TestCase):
"Default values for strptime() are incorrect;" "Default values for strptime() are incorrect;"
" %s != %s" % (strp_output, defaults)) " %s != %s" % (strp_output, defaults))
def test_escaping(self):
# Make sure all characters that have regex significance are escaped.
# Parentheses are in a purposeful order; will cause an error of
# unbalanced parentheses when the regex is compiled if they are not
# escaped.
# Test instigated by bug #796149 .
need_escaping = ".^$*+?{}\[]|)("
self.failUnless(_strptime.strptime(need_escaping, need_escaping))
class Strptime12AMPMTests(unittest.TestCase): class Strptime12AMPMTests(unittest.TestCase):
"""Test a _strptime regression in '%I %p' at 12 noon (12 PM)""" """Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""