From: Serhiy Storchaka Date: Tue, 24 Mar 2015 23:21:50 +0000 (+0200) Subject: Fixed using deprecated escaping in regular expression in _strptime.py (issue23622). X-Git-Tag: v3.5.0a3~53 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15fa1c4ade79060e340a656e1f69c70ebe355171;p=thirdparty%2FPython%2Fcpython.git Fixed using deprecated escaping in regular expression in _strptime.py (issue23622). --- diff --git a/Lib/_strptime.py b/Lib/_strptime.py index f4a98ecfce11..374923dd1351 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -253,8 +253,8 @@ class TimeRE(dict): # format directives (%m, etc.). regex_chars = re_compile(r"([\\.^$*+?\(\){}\[\]|])") format = regex_chars.sub(r"\\\1", format) - whitespace_replacement = re_compile('\s+') - format = whitespace_replacement.sub('\s+', format) + whitespace_replacement = re_compile(r'\s+') + format = whitespace_replacement.sub(r'\\s+', format) while '%' in format: directive_index = format.index('%')+1 processed_format = "%s%s%s" % (processed_format, diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index af729c30db19..e6f1f1d839a2 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -915,7 +915,7 @@ def parse_template(source, pattern): if c in ASCIILETTERS: import warnings warnings.warn('bad escape %s' % this, - DeprecationWarning, stacklevel=5) + DeprecationWarning, stacklevel=4) lappend(this) else: lappend(this)