[tools] Fix python DeprecationWarning: invalid escape sequence

The python documentation says "it’s highly recommended that you use raw strings for all but the simplest expressions." (https://docs.python.org/3/library/re.html)

So do that with the attached patch generated by

    sed -i -e "s/re.search('/re.search(r'/g" $(git grep -l 're.search(')

The warning can be seen in e.g. python3.7:

    $ python3.7 -Wd
    >>> import re; re.search('\s', '')
    <stdin>:1: DeprecationWarning: invalid escape sequence \s

Commited on behalf of Marco Falke.
Differential Revision: https://reviews.llvm.org/D57528

llvm-svn: 353707
This commit is contained in:
Serge Guelton 2019-02-11 15:03:17 +00:00
parent 83e68854d5
commit 3331b6eab3
3 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ def main():
filename = None filename = None
lines_by_file = {} lines_by_file = {}
for line in sys.stdin: for line in sys.stdin:
match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line) match = re.search(r'^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
if match: if match:
filename = match.group(2) filename = match.group(2)
if filename == None: if filename == None:
@ -79,7 +79,7 @@ def main():
if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE): if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
continue continue
match = re.search('^@@.*\+(\d+)(,(\d+))?', line) match = re.search(r'^@@.*\+(\d+)(,(\d+))?', line)
if match: if match:
start_line = int(match.group(1)) start_line = int(match.group(1))
line_count = 1 line_count = 1

View File

@ -97,7 +97,7 @@ def need_analyzer(args):
when compiler wrappers are used. That's the moment when build setup when compiler wrappers are used. That's the moment when build setup
check the compiler and capture the location for the build process. """ check the compiler and capture the location for the build process. """
return len(args) and not re.search('configure|autogen', args[0]) return len(args) and not re.search(r'configure|autogen', args[0])
def prefix_with(constant, pieces): def prefix_with(constant, pieces):

View File

@ -42,7 +42,7 @@ def ModifySpec(path, isBuiltinAnalyzer, pathToChecker):
if line.find("Static Analyzer") >= 0: if line.find("Static Analyzer") >= 0:
foundAnalyzer = True foundAnalyzer = True
else: else:
m = re.search('^(\s*ExecPath\s*=\s*")', line) m = re.search(r'^(\s*ExecPath\s*=\s*")', line)
if m: if m:
line = "".join([m.group(0), pathToChecker, '";\n']) line = "".join([m.group(0), pathToChecker, '";\n'])
# Do not modify further ExecPath's later in the xcspec. # Do not modify further ExecPath's later in the xcspec.