This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 7de12138fe yapf.sh: run on non-.py tools/ scripts (#11476)
7de12138fe is described below
commit 7de12138fe921f8e9288f3edcca46f0c7913a5b9
Author: Brian Neradt <[email protected]>
AuthorDate: Tue Jun 25 12:08:51 2024 -0500
yapf.sh: run on non-.py tools/ scripts (#11476)
This updates our yapf.sh script to run yapf on Python files in the tools
directory that don't have the .py extension.
---
tools/check-unused-dependencies | 52 ++++++++++++---------------------
tools/cvtremappi | 65 +++++++++++++++++++++--------------------
tools/yapf.sh | 2 ++
3 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/tools/check-unused-dependencies b/tools/check-unused-dependencies
index 99f78cadc8..a4376961d5 100755
--- a/tools/check-unused-dependencies
+++ b/tools/check-unused-dependencies
@@ -40,47 +40,37 @@ programs_re = re.compile(r'([^\n ]*_)PROGRAMS \+?= (.*)')
def get_dependencies(program):
- args = [
- './libtool', '--mode=execute', 'ldd', '--unused', '--function-relocs',
- program
- ]
+ args = ['./libtool', '--mode=execute', 'ldd', '--unused',
'--function-relocs', program]
for dependency in subprocess.Popen(args, stdout=subprocess.PIPE).stdout:
dependency = dependency.decode('utf-8')[:-1]
- if any(
- map(
+ if any(map(
os.path.basename(dependency).startswith,
- [
- 'libdl.so.', # Because we add -ldl to LIBS
- 'libgcc_s.so.',
- 'libm.so.', # Why does Libtool call ld with -lm?
- 'libpthread.so.', # Because we add -lpthread to LIBS
- ])):
+ [
+ 'libdl.so.', # Because we add -ldl to LIBS
+ 'libgcc_s.so.',
+ 'libm.so.', # Why does Libtool call ld with -lm?
+ 'libpthread.so.', # Because we add -lpthread to LIBS
+ ])):
continue
progbase = os.path.basename(program)
# clang+asan pulls in dependencies for these specific tools:
- if any(
- map(
- progbase.__eq__,
- [
- 'jtest',
- 'http_load',
- 'escape_mapper',
- ])):
- if any(
- map(
- os.path.basename(dependency).startswith,
- [
- 'librt.so',
- 'libresolv.so',
- ])):
+ if any(map(progbase.__eq__, [
+ 'jtest',
+ 'http_load',
+ 'escape_mapper',
+ ])):
+ if any(map(os.path.basename(dependency).startswith, [
+ 'librt.so',
+ 'libresolv.so',
+ ])):
continue
-
if re.sub(r'\s+', '', dependency):
yield dependency
+
success = True
filename = 'config.status'
contents = open(filename).read()
@@ -91,11 +81,7 @@ for filename in config_files.split():
contents = open(filename).read()
contents = contents.replace('\\\n', '')
for prefix, programs in programs_re.findall(contents):
- if prefix not in [
- 'EXTRA_',
- 'check_',
- 'noinst_'
- ]:
+ if prefix not in ['EXTRA_', 'check_', 'noinst_']:
for program in programs.split():
program = os.path.join(os.path.dirname(filename), program)
if os.path.exists(program):
diff --git a/tools/cvtremappi b/tools/cvtremappi
index 8cee33b6ad..934a00eff7 100755
--- a/tools/cvtremappi
+++ b/tools/cvtremappi
@@ -25,22 +25,19 @@ import argparse
BACKSLASH = "\\"
-parser = argparse.ArgumentParser(
- prog="cvt7to9",
- description= "Convert remap configuration from ATS7 to ATS9"
-)
+parser = argparse.ArgumentParser(prog="cvt7to9", description="Convert remap
configuration from ATS7 to ATS9")
parser.add_argument("--filepath", default="remap.config", help="path specifier
of remap config file")
parser.add_argument("--prefix", default="1st-", help="prefix for new
header_rewrite config files")
-parser.add_argument(
- "--plugin", default=None, help="path specifier (relative to FILEPATH) of
(global) plugins config file"
-)
+parser.add_argument("--plugin", default=None, help="path specifier (relative
to FILEPATH) of (global) plugins config file")
args = parser.parse_args()
import sys
+
def eprint(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)
+
# Prefix to add to file relative pathspecs before opening file.
#
pathspec_prefix = None
@@ -48,9 +45,11 @@ pathspec_prefix = None
import os
import copy
+
# Remap or header rewrite config file.
#
class CfgFile:
+
def __init__(self, param):
if isinstance(param, CfgFile):
# Making copy of header rewrite config file to use when header
rewrite is first plugin for remap
@@ -119,12 +118,15 @@ class CfgFile:
eprint(f"fatal error: failure closing {ps}")
sys.exit(1)
+
# A generic object.
#
class Obj:
+
def __init__(self):
pass
+
# A dictionary that is a mapping from pathspecs for header rewrite config
files to generic objects. If the
# object has a "first" attribute, it is a list of 2-tuples. The first tuple
entry is a reference to the
# the CfgFile object for a remap config file. The second tuple entry is the
index into the list of lines,
@@ -136,6 +138,7 @@ class Obj:
#
header_rewrite_cfgs = dict()
+
# Read in (global) header rewrite config file pathspecs from plugin.config
file.
#
def handle_global(gbl_pathspec):
@@ -189,11 +192,13 @@ def handle_global(gbl_pathspec):
ln_num += num_ln_joined
+
# A list of CfgFile instances for the main remap config file and any include
files it contains, directly or
# indirectly.
#
remap_cfgs = []
+
# Handle the remap config file, and call this recursively to handle include
files.
#
def handle_remap(filepath):
@@ -251,7 +256,7 @@ def handle_remap(filepath):
else:
# First, gzip.so -> compress.so
#
- lnc = ln[:len_content]
+ lnc = ln[:len_content]
lncr = lnc.replace("@plugin=gzip.so", "@plugin=compress.so")
if lncr != lnc:
ln = lncr + ln[len_content:]
@@ -273,7 +278,7 @@ def handle_remap(filepath):
while ofst < len_content:
ofst2 = ln[ofst:len_content].find("@")
if ofst2 < 0:
- break;
+ break
ofst += ofst2
@@ -294,7 +299,7 @@ def handle_remap(filepath):
if hr_pathspec not in header_rewrite_cfgs:
hr_obj = Obj()
- header_rewrite_cfgs[hr_pathspec] = hr_obj;
+ header_rewrite_cfgs[hr_pathspec] = hr_obj
else:
hr_obj = header_rewrite_cfgs[hr_pathspec]
@@ -313,8 +318,7 @@ def handle_remap(filepath):
else:
ofst2 += ofst
- if ((ln[ofst:ofst2].find("@pparam=pristine") < 0) and
- (ln[ofst:ofst2].find("@pparam=no-pristine") < 0)):
+ if ((ln[ofst:ofst2].find("@pparam=pristine") < 0) and
(ln[ofst:ofst2].find("@pparam=no-pristine") < 0)):
new_ln = ln[:ofst2]
@@ -374,7 +378,7 @@ def handle_remap(filepath):
if hr_pathspec not in header_rewrite_cfgs:
hr_obj = Obj()
- header_rewrite_cfgs[hr_pathspec] = hr_obj;
+ header_rewrite_cfgs[hr_pathspec] = hr_obj
else:
hr_obj = header_rewrite_cfgs[hr_pathspec]
@@ -382,6 +386,7 @@ def handle_remap(filepath):
ln_num += num_ln_joined
+
def handle_header_rewrite(pathspec, obj):
# This class manages changes to a header rewrite config file.
@@ -391,7 +396,7 @@ def handle_header_rewrite(pathspec, obj):
#
def __init__(self, pathspec, obj):
self._base = CfgFile(pathspec)
- self._obj = obj
+ self._obj = obj
def has_first(self):
return hasattr(self._obj, "first")
@@ -411,7 +416,7 @@ def handle_header_rewrite(pathspec, obj):
#
self._first = CfgFile(self._base)
else:
- self._first = self._base
+ self._first = self._base
self._first.changed = True
self._first.lines[ln_num] = ln
@@ -423,7 +428,7 @@ def handle_header_rewrite(pathspec, obj):
self._first.lines[ln_num] = ln
self._base.lines[ln_num] = ln
- self._base.changed = True
+ self._base.changed = True
def close(self):
self._base.close()
@@ -448,14 +453,14 @@ def handle_header_rewrite(pathspec, obj):
def get_content_len(s):
# States.
#
- COPYING = 0
- ESCAPE_COPYING = 1
- IN_QUOTED = 2
- ESCAPE_IN_QUOTED = 3
+ COPYING = 0
+ ESCAPE_COPYING = 1
+ IN_QUOTED = 2
+ ESCAPE_IN_QUOTED = 3
PERCENT_IN_QUOTED = 4
- state = COPYING
- ofst = 0
+ state = COPYING
+ ofst = 0
variable_expansion = False
while ofst < (len(s) - 1):
@@ -508,22 +513,20 @@ def handle_header_rewrite(pathspec, obj):
lines = hrc.get_lines()
ln_num = 0
while ln_num < len(lines):
- ln = lines[ln_num]
+ ln = lines[ln_num]
prepend_error = False
len_content, variable_expansion = get_content_len(ln)
if variable_expansion:
- eprint(
- f"error: {pathspec}, line {ln_num + 1}: variable expansions
cannot be automatically converted"
- )
+ eprint(f"error: {pathspec}, line {ln_num + 1}: variable expansions
cannot be automatically converted")
prepend_error = True
lnc = ln[:len_content]
- lnc = lnc.replace("%{CLIENT-IP}", "%{INBOUND:REMOTE-ADDR}")
+ lnc = lnc.replace("%{CLIENT-IP}", "%{INBOUND:REMOTE-ADDR}")
lnc = lnc.replace("%{INCOMING-PORT}", "%{INBOUND:LOCAL-PORT}")
- lnc = lnc.replace("%{PATH}", "%{URL:PATH}")
- lnc = lnc.replace("%{QUERY}", "%{URL:QUERY}")
+ lnc = lnc.replace("%{PATH}", "%{URL:PATH}")
+ lnc = lnc.replace("%{QUERY}", "%{URL:QUERY}")
if hrc.has_other() and (prepend_error or (lnc != ln[:len_content])):
if prepend_error:
@@ -541,8 +544,7 @@ def handle_header_rewrite(pathspec, obj):
if (ofst2 > 0) and lnc[ofst:(ofst + ofst2)].isspace():
eprint(
f"error: {pathspec}, line {ln_num + 1}: the
functionality of set-destination PATH" +
- " for the first remap plugin does not exist in
ATS9"
- )
+ " for the first remap plugin does not exist in
ATS9")
prepend_error = True
lnc = lnc.replace("%{URL:", "%{CLIENT-URL:")
@@ -556,6 +558,7 @@ def handle_header_rewrite(pathspec, obj):
hrc.close()
+
pathspec_prefix = os.path.dirname(args.filepath)
if (pathspec_prefix != "") and (pathspec_prefix != "/"):
pathspec_prefix += "/"
diff --git a/tools/yapf.sh b/tools/yapf.sh
index 2a163c3fc8..a6ca3795b3 100755
--- a/tools/yapf.sh
+++ b/tools/yapf.sh
@@ -79,6 +79,8 @@ _END_
# Keep this list of Python extensions the same with the list of
# extensions searched for in the tools/git/pre-commit hook.
grep -E '\.py$|\.cli.ext$|\.test.ext$' ${files} > ${files_filtered}
+ # Add back in the tools Python scripts without a .py extension.
+ grep -rl '#!.*python' "${REPO_ROOT}/tools" | grep -vE '(yapf.sh|.py)' | sed
"s:${REPO_ROOT}/::g" >> ${files_filtered}
# Prepend the filenames with "./" to make the modified file output consistent
# with the clang-format target output.
sed -i'.bak' 's:^:\./:' ${files_filtered}
