From adada454292d261ba95bab68c6c9e9247eeedaa3 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 3 Jun 2016 17:50:44 -0700 Subject: Issue #24225: Fix additional renamed module references. --- Tools/scripts/idle3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tools/scripts') diff --git a/Tools/scripts/idle3 b/Tools/scripts/idle3 index 8ee92c2afe..d7332bca48 100755 --- a/Tools/scripts/idle3 +++ b/Tools/scripts/idle3 @@ -1,5 +1,5 @@ #! /usr/bin/env python3 -from idlelib.PyShell import main +from idlelib.pyshell import main if __name__ == '__main__': main() -- cgit v1.2.1 From 03c8a473999b08710ae3661724cf1bf1d76bc555 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Thu, 8 Sep 2016 13:59:53 -0400 Subject: #27364: fix "incorrect" uses of escape character in the stdlib. And most of the tools. Patch by Emanual Barry, reviewed by me, Serhiy Storchaka, and Martin Panter. --- Tools/scripts/fixdiv.py | 4 ++-- Tools/scripts/h2py.py | 8 ++++---- Tools/scripts/highlight.py | 16 ++++++++-------- Tools/scripts/mailerdaemon.py | 2 +- Tools/scripts/parseentities.py | 4 ++-- Tools/scripts/pathfix.py | 2 +- Tools/scripts/ptags.py | 2 +- Tools/scripts/svneol.py | 2 +- Tools/scripts/texi2html.py | 10 +++++----- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'Tools/scripts') diff --git a/Tools/scripts/fixdiv.py b/Tools/scripts/fixdiv.py index 20f33865e2..1213a4e397 100755 --- a/Tools/scripts/fixdiv.py +++ b/Tools/scripts/fixdiv.py @@ -174,8 +174,8 @@ def usage(msg): sys.stderr.write("Usage: %s [-m] warnings\n" % sys.argv[0]) sys.stderr.write("Try `%s -h' for more information.\n" % sys.argv[0]) -PATTERN = ("^(.+?):(\d+): DeprecationWarning: " - "classic (int|long|float|complex) division$") +PATTERN = (r"^(.+?):(\d+): DeprecationWarning: " + r"classic (int|long|float|complex) division$") def readwarnings(warningsfile): prog = re.compile(PATTERN) diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py index 0967fc29d6..4363c0cf73 100755 --- a/Tools/scripts/h2py.py +++ b/Tools/scripts/h2py.py @@ -23,13 +23,13 @@ import sys, re, getopt, os -p_define = re.compile('^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+') +p_define = re.compile(r'^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+') p_macro = re.compile( - '^[\t ]*#[\t ]*define[\t ]+' - '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+') + r'^[\t ]*#[\t ]*define[\t ]+' + r'([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+') -p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>') +p_include = re.compile(r'^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>') p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?') p_cpp_comment = re.compile('//.*') diff --git a/Tools/scripts/highlight.py b/Tools/scripts/highlight.py index 66ad868ec3..9272fee4ee 100755 --- a/Tools/scripts/highlight.py +++ b/Tools/scripts/highlight.py @@ -147,14 +147,14 @@ def build_html_page(classified_text, title='python', #### LaTeX Output ########################################## default_latex_commands = { - 'comment': '{\color{red}#1}', - 'string': '{\color{ForestGreen}#1}', - 'docstring': '{\emph{\color{ForestGreen}#1}}', - 'keyword': '{\color{orange}#1}', - 'builtin': '{\color{purple}#1}', - 'definition': '{\color{orange}#1}', - 'defname': '{\color{blue}#1}', - 'operator': '{\color{brown}#1}', + 'comment': r'{\color{red}#1}', + 'string': r'{\color{ForestGreen}#1}', + 'docstring': r'{\emph{\color{ForestGreen}#1}}', + 'keyword': r'{\color{orange}#1}', + 'builtin': r'{\color{purple}#1}', + 'definition': r'{\color{orange}#1}', + 'defname': r'{\color{blue}#1}', + 'operator': r'{\color{brown}#1}', } default_latex_document = r''' diff --git a/Tools/scripts/mailerdaemon.py b/Tools/scripts/mailerdaemon.py index aeb451e942..635e5482e6 100755 --- a/Tools/scripts/mailerdaemon.py +++ b/Tools/scripts/mailerdaemon.py @@ -88,7 +88,7 @@ del i # no more expressions are searched for. So, order is important. emparse_list_reason = [ r'^5\d{2} <>\.\.\. (?P.*)', - '<>\.\.\. (?P.*)', + r'<>\.\.\. (?P.*)', re.compile(r'^<<< 5\d{2} (?P.*)', re.MULTILINE), re.compile('===== stderr was =====\nrmail: (?P.*)'), re.compile('^Diagnostic-Code: (?P.*)', re.MULTILINE), diff --git a/Tools/scripts/parseentities.py b/Tools/scripts/parseentities.py index a042d1c24c..c686b0241a 100755 --- a/Tools/scripts/parseentities.py +++ b/Tools/scripts/parseentities.py @@ -14,7 +14,7 @@ """ import re,sys -entityRE = re.compile('') +entityRE = re.compile(r'') def parse(text,pos=0,endpos=None): @@ -39,7 +39,7 @@ def writefile(f,defs): if charcode[:2] == '&#': code = int(charcode[2:-1]) if code < 256: - charcode = "'\%o'" % code + charcode = r"'\%o'" % code else: charcode = repr(charcode) else: diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py index 22432d1639..562bbc7378 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -64,7 +64,7 @@ def main(): if fix(arg): bad = 1 sys.exit(bad) -ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$') +ispythonprog = re.compile(r'^[a-zA-Z0-9_]+\.py$') def ispython(name): return bool(ispythonprog.match(name)) diff --git a/Tools/scripts/ptags.py b/Tools/scripts/ptags.py index ca643b3494..396cbd07ea 100755 --- a/Tools/scripts/ptags.py +++ b/Tools/scripts/ptags.py @@ -24,7 +24,7 @@ def main(): for s in tags: fp.write(s) -expr = '^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*[:\(]' +expr = r'^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*[:\(]' matcher = re.compile(expr) def treat_file(filename): diff --git a/Tools/scripts/svneol.py b/Tools/scripts/svneol.py index 8abdd01529..6c70da9692 100755 --- a/Tools/scripts/svneol.py +++ b/Tools/scripts/svneol.py @@ -1,6 +1,6 @@ #! /usr/bin/env python3 -""" +r""" SVN helper script. Try to set the svn:eol-style property to "native" on every .py, .txt, .c and diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py index 99835280fe..9c1e9fe8d8 100755 --- a/Tools/scripts/texi2html.py +++ b/Tools/scripts/texi2html.py @@ -78,11 +78,11 @@ spprog = re.compile('[\n@{}&<>]') # Special characters in # running text # # menu item (Yuck!) -miprog = re.compile('^\* ([^:]*):(:|[ \t]*([^\t,\n.]+)([^ \t\n]*))[ \t\n]*') -# 0 1 1 2 3 34 42 0 -# ----- ---------- --------- -# -|----------------------------- -# ----------------------------------------------------- +miprog = re.compile(r'^\* ([^:]*):(:|[ \t]*([^\t,\n.]+)([^ \t\n]*))[ \t\n]*') +# 0 1 1 2 3 34 42 0 +# ----- ---------- --------- +# -|----------------------------- +# ----------------------------------------------------- -- cgit v1.2.1 From 89b185481a16054baec15dc0056afe2f58f781ec Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Thu, 8 Sep 2016 13:47:41 -0700 Subject: Remove legacy "from __future__ import with_statement" lines. --- Tools/scripts/generate_opcode_h.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'Tools/scripts') diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py index c62f9a5b23..948b56f900 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -1,7 +1,5 @@ # This script generates the opcode.h header file. -from __future__ import with_statement - import sys header = """/* Auto-generated by Tools/scripts/generate_opcode_h.py */ #ifndef Py_OPCODE_H -- cgit v1.2.1