diff options
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/build/check_extension_modules.py (renamed from Tools/scripts/check_extension_modules.py) | 0 | ||||
-rw-r--r-- | Tools/build/deepfreeze.py (renamed from Tools/scripts/deepfreeze.py) | 0 | ||||
-rw-r--r-- | Tools/build/freeze_modules.py (renamed from Tools/scripts/freeze_modules.py) | 4 | ||||
-rw-r--r-- | Tools/build/generate_global_objects.py (renamed from Tools/scripts/generate_global_objects.py) | 3 | ||||
-rw-r--r-- | Tools/build/generate_levenshtein_examples.py (renamed from Tools/scripts/generate_levenshtein_examples.py) | 0 | ||||
-rw-r--r-- | Tools/build/generate_opcode_h.py (renamed from Tools/scripts/generate_opcode_h.py) | 2 | ||||
-rwxr-xr-x | Tools/build/generate_re_casefix.py (renamed from Tools/scripts/generate_re_casefix.py) | 6 | ||||
-rwxr-xr-x | Tools/build/generate_sre_constants.py (renamed from Tools/scripts/generate_sre_constants.py) | 6 | ||||
-rw-r--r-- | Tools/build/generate_stdlib_module_names.py (renamed from Tools/scripts/generate_stdlib_module_names.py) | 4 | ||||
-rwxr-xr-x | Tools/build/generate_token.py (renamed from Tools/scripts/generate_token.py) | 25 | ||||
-rwxr-xr-x | Tools/build/parse_html5_entities.py (renamed from Tools/scripts/parse_html5_entities.py) | 3 | ||||
-rwxr-xr-x | Tools/build/smelly.py (renamed from Tools/scripts/smelly.py) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | Tools/build/stable_abi.py (renamed from Tools/scripts/stable_abi.py) | 11 | ||||
-rw-r--r-- | Tools/build/umarshal.py (renamed from Tools/scripts/umarshal.py) | 0 | ||||
-rw-r--r-- | Tools/build/update_file.py (renamed from Tools/scripts/update_file.py) | 0 | ||||
-rwxr-xr-x | Tools/build/verify_ensurepip_wheels.py (renamed from Tools/scripts/verify_ensurepip_wheels.py) | 0 |
16 files changed, 41 insertions, 23 deletions
diff --git a/Tools/scripts/check_extension_modules.py b/Tools/build/check_extension_modules.py index 59239c6..59239c6 100644 --- a/Tools/scripts/check_extension_modules.py +++ b/Tools/build/check_extension_modules.py diff --git a/Tools/scripts/deepfreeze.py b/Tools/build/deepfreeze.py index 28ac2b1..28ac2b1 100644 --- a/Tools/scripts/deepfreeze.py +++ b/Tools/build/deepfreeze.py diff --git a/Tools/scripts/freeze_modules.py b/Tools/build/freeze_modules.py index aa1e4fe..810224b 100644 --- a/Tools/scripts/freeze_modules.py +++ b/Tools/build/freeze_modules.py @@ -581,7 +581,7 @@ def regen_makefile(modules): frozenfiles = [] rules = [''] deepfreezerules = ["Python/deepfreeze/deepfreeze.c: $(DEEPFREEZE_DEPS)", - "\t$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py \\"] + "\t$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/build/deepfreeze.py \\"] for src in _iter_sources(modules): frozen_header = relpath_for_posix_display(src.frozenfile, ROOT_DIR) frozenfiles.append(f'\t\t{frozen_header} \\') @@ -646,7 +646,7 @@ def regen_pcbuild(modules): projlines = [] filterlines = [] corelines = [] - deepfreezerules = ['\t<Exec Command=\'$(PythonForBuild) "$(PySourcePath)Tools\\scripts\\deepfreeze.py" ^'] + deepfreezerules = ['\t<Exec Command=\'$(PythonForBuild) "$(PySourcePath)Tools\\build\\deepfreeze.py" ^'] for src in _iter_sources(modules): pyfile = relpath_for_windows_display(src.pyfile, ROOT_DIR) header = relpath_for_windows_display(src.frozenfile, ROOT_DIR) diff --git a/Tools/scripts/generate_global_objects.py b/Tools/build/generate_global_objects.py index 0432bf5..dd67cfe 100644 --- a/Tools/scripts/generate_global_objects.py +++ b/Tools/build/generate_global_objects.py @@ -3,6 +3,7 @@ import io import os.path import re +SCRIPT_NAME = 'Tools/build/generate_global_objects.py' __file__ = os.path.abspath(__file__) ROOT = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) INTERNAL = os.path.join(ROOT, 'Include', 'internal') @@ -213,7 +214,7 @@ def open_for_changes(filename, orig): ####################################### # the global objects -START = '/* The following is auto-generated by Tools/scripts/generate_global_objects.py. */' +START = f'/* The following is auto-generated by {SCRIPT_NAME}. */' END = '/* End auto-generated code */' diff --git a/Tools/scripts/generate_levenshtein_examples.py b/Tools/build/generate_levenshtein_examples.py index 5a8360f..5a8360f 100644 --- a/Tools/scripts/generate_levenshtein_examples.py +++ b/Tools/build/generate_levenshtein_examples.py diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/build/generate_opcode_h.py index 9ff264a..372221a 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/build/generate_opcode_h.py @@ -3,7 +3,7 @@ import sys import tokenize -SCRIPT_NAME = "Tools/scripts/generate_opcode_h.py" +SCRIPT_NAME = "Tools/build/generate_opcode_h.py" PYTHON_OPCODE = "Lib/opcode.py" header = f""" diff --git a/Tools/scripts/generate_re_casefix.py b/Tools/build/generate_re_casefix.py index 625b065..b57ac07 100755 --- a/Tools/scripts/generate_re_casefix.py +++ b/Tools/build/generate_re_casefix.py @@ -5,6 +5,8 @@ import collections import sys import unicodedata +SCRIPT_NAME = 'Tools/build/generate_re_casefix.py' + def update_file(file, content): try: with open(file, 'r', encoding='utf-8') as fobj: @@ -16,8 +18,8 @@ def update_file(file, content): fobj.write(content) return True -re_casefix_template = """\ -# Auto-generated by Tools/scripts/generate_re_casefix.py. +re_casefix_template = f"""\ +# Auto-generated by {SCRIPT_NAME}. # Maps the code of lowercased character to codes of different lowercased # characters which have the same uppercase. diff --git a/Tools/scripts/generate_sre_constants.py b/Tools/build/generate_sre_constants.py index 7271507..abea069 100755 --- a/Tools/scripts/generate_sre_constants.py +++ b/Tools/build/generate_sre_constants.py @@ -1,6 +1,8 @@ #! /usr/bin/env python3 # This script generates Modules/_sre/sre_constants.h from Lib/re/_constants.py. +SCRIPT_NAME = 'Tools/build/generate_sre_constants.py' + def update_file(file, content): try: @@ -13,13 +15,13 @@ def update_file(file, content): fobj.write(content) return True -sre_constants_header = """\ +sre_constants_header = f"""\ /* * Secret Labs' Regular Expression Engine * * regular expression matching engine * - * Auto-generated by Tools/scripts/generate_sre_constants.py from + * Auto-generated by {SCRIPT_NAME} from * Lib/re/_constants.py. * * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. diff --git a/Tools/scripts/generate_stdlib_module_names.py b/Tools/build/generate_stdlib_module_names.py index 92100bd..e4f09f8 100644 --- a/Tools/scripts/generate_stdlib_module_names.py +++ b/Tools/build/generate_stdlib_module_names.py @@ -10,6 +10,8 @@ import sysconfig from check_extension_modules import ModuleChecker +SCRIPT_NAME = 'Tools/build/generate_stdlib_module_names.py' + SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) STDLIB_PATH = os.path.join(SRC_DIR, 'Lib') @@ -112,7 +114,7 @@ def list_modules(): def write_modules(fp, names): - print("// Auto-generated by Tools/scripts/generate_stdlib_module_names.py.", + print(f"// Auto-generated by {SCRIPT_NAME}.", file=fp) print("// List used to create sys.stdlib_module_names.", file=fp) print(file=fp) diff --git a/Tools/scripts/generate_token.py b/Tools/build/generate_token.py index d8be8b9..fc12835 100755 --- a/Tools/scripts/generate_token.py +++ b/Tools/build/generate_token.py @@ -7,6 +7,8 @@ # Lib/token.py +SCRIPT_NAME = 'Tools/build/generate_token.py' +AUTO_GENERATED_BY_SCRIPT = f'Auto-generated by {SCRIPT_NAME}' NT_OFFSET = 256 def load_tokens(path): @@ -47,8 +49,10 @@ def update_file(file, content): return True -token_h_template = """\ -/* Auto-generated by Tools/scripts/generate_token.py */ +token_h_template = f"""\ +/* {AUTO_GENERATED_BY_SCRIPT} */ +""" +token_h_template += """\ /* Token types */ #ifndef Py_INTERNAL_TOKEN_H @@ -105,8 +109,10 @@ def make_h(infile, outfile='Include/internal/pycore_token.h'): print("%s regenerated from %s" % (outfile, infile)) -token_c_template = """\ -/* Auto-generated by Tools/scripts/generate_token.py */ +token_c_template = f"""\ +/* {AUTO_GENERATED_BY_SCRIPT} */ +""" +token_c_template += """\ #include "Python.h" #include "pycore_token.h" @@ -189,8 +195,8 @@ def make_c(infile, outfile='Parser/token.c'): print("%s regenerated from %s" % (outfile, infile)) -token_inc_template = """\ -.. Auto-generated by Tools/scripts/generate_token.py +token_inc_template = f"""\ +.. {AUTO_GENERATED_BY_SCRIPT} %s .. data:: N_TOKENS @@ -213,10 +219,11 @@ def make_rst(infile, outfile='Doc/library/token-list.inc'): print("%s regenerated from %s" % (outfile, infile)) -token_py_template = '''\ +token_py_template = f'''\ """Token constants.""" -# Auto-generated by Tools/scripts/generate_token.py - +# {AUTO_GENERATED_BY_SCRIPT} +''' +token_py_template += ''' __all__ = ['tok_name', 'ISTERMINAL', 'ISNONTERMINAL', 'ISEOF'] %s diff --git a/Tools/scripts/parse_html5_entities.py b/Tools/build/parse_html5_entities.py index 1e5bdad..d2bf290 100755 --- a/Tools/scripts/parse_html5_entities.py +++ b/Tools/build/parse_html5_entities.py @@ -18,6 +18,7 @@ import json from urllib.request import urlopen from html.entities import html5 +SCRIPT_NAME = 'Tools/build/parse_html5_entities.py' PAGE_URL = 'https://html.spec.whatwg.org/multipage/named-characters.html' ENTITIES_URL = 'https://html.spec.whatwg.org/entities.json' HTML5_SECTION_START = '# HTML5 named character references' @@ -69,7 +70,7 @@ def write_items(entities, file=sys.stdout): keys = sorted(entities.keys()) keys = sorted(keys, key=str.lower) print(HTML5_SECTION_START, file=file) - print(f'# Generated by {sys.argv[0]!r}\n' + print(f'# Generated by {SCRIPT_NAME}\n' f'# from {ENTITIES_URL} and\n' f'# {PAGE_URL}.\n' f'# Map HTML5 named character references to the ' diff --git a/Tools/scripts/smelly.py b/Tools/build/smelly.py index 276a5ab..276a5ab 100755 --- a/Tools/scripts/smelly.py +++ b/Tools/build/smelly.py diff --git a/Tools/scripts/stable_abi.py b/Tools/build/stable_abi.py index d557e10..88db93e 100755..100644 --- a/Tools/scripts/stable_abi.py +++ b/Tools/build/stable_abi.py @@ -24,6 +24,7 @@ import io import re import csv +SCRIPT_NAME = 'Tools/build/stable_abi.py' MISSING = object() EXCLUDED_HEADERS = { @@ -182,11 +183,12 @@ def generator(var_name, default_path): def gen_python3dll(manifest, args, outfile): """Generate/check the source for the Windows stable ABI library""" write = partial(print, file=outfile) - write(textwrap.dedent(r""" + content = f""" /* Re-export stable Python ABI */ - /* Generated by Tools/scripts/stable_abi.py */ - + /* Generated by {SCRIPT_NAME} */ + """ + content += r""" #ifdef _M_IX86 #define DECORATE "_" #else @@ -197,7 +199,8 @@ def gen_python3dll(manifest, args, outfile): __pragma(comment(linker, "/EXPORT:" DECORATE #name "=" PYTHON_DLL_NAME "." #name)) #define EXPORT_DATA(name) \ __pragma(comment(linker, "/EXPORT:" DECORATE #name "=" PYTHON_DLL_NAME "." #name ",DATA")) - """)) + """ + write(textwrap.dedent(content)) def sort_key(item): return item.name.lower() diff --git a/Tools/scripts/umarshal.py b/Tools/build/umarshal.py index f61570c..f61570c 100644 --- a/Tools/scripts/umarshal.py +++ b/Tools/build/umarshal.py diff --git a/Tools/scripts/update_file.py b/Tools/build/update_file.py index b4182c1..b4182c1 100644 --- a/Tools/scripts/update_file.py +++ b/Tools/build/update_file.py diff --git a/Tools/scripts/verify_ensurepip_wheels.py b/Tools/build/verify_ensurepip_wheels.py index 044d1fd..044d1fd 100755 --- a/Tools/scripts/verify_ensurepip_wheels.py +++ b/Tools/build/verify_ensurepip_wheels.py |