Reformat python files checked by pylint (part 1/2).
After recently changing .pylintrc (see [1]) we discovered that
the presubmit check always checks all the python files when just
one python file gets updated.
This CL moves all these files one step closer to what the linter
wants.
Autogenerated with:
# Added all the files under pylint control to ~/Desktop/to-reformat
cat ~/Desktop/to-reformat | xargs sed -i '1i\\'
git cl format --python --full
This is part 1 out of 2. The second part will fix function names and
will not be automated.
[1] - https://webrtc-review.googlesource.com/c/src/+/186664
No-Presubmit: True
Bug: webrtc:12114
Change-Id: Idfec4d759f209a2090440d0af2413a1ddc01b841
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190980
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32530}
diff --git a/tools_webrtc/clang_tidy.py b/tools_webrtc/clang_tidy.py
index 49a9427..bce2549 100755
--- a/tools_webrtc/clang_tidy.py
+++ b/tools_webrtc/clang_tidy.py
@@ -6,7 +6,6 @@
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-
"""Invoke clang-tidy tool.
Usage: clang_tidy.py file.cc [clang-tidy-args...]
@@ -25,7 +24,6 @@
from presubmit_checks_lib.build_helpers import GetClangTidyPath, \
GetCompilationCommand
-
# We enable all checkers by default for investigation purpose.
# This includes clang-analyzer-* checks.
# Individual checkers can be disabled via command line options.
@@ -34,63 +32,66 @@
def Process(filepath, args):
- # Build directory is needed to gather compilation flags.
- # Create a temporary one (instead of reusing an existing one)
- # to keep the CLI simple and unencumbered.
- out_dir = tempfile.mkdtemp('clang_tidy')
+ # Build directory is needed to gather compilation flags.
+ # Create a temporary one (instead of reusing an existing one)
+ # to keep the CLI simple and unencumbered.
+ out_dir = tempfile.mkdtemp('clang_tidy')
- try:
- gn_args = [] # Use default build.
- command = GetCompilationCommand(filepath, gn_args, out_dir)
+ try:
+ gn_args = [] # Use default build.
+ command = GetCompilationCommand(filepath, gn_args, out_dir)
- # Remove warning flags. They aren't needed and they cause trouble
- # when clang-tidy doesn't match most recent clang.
- # Same battle for -f (e.g. -fcomplete-member-pointers).
- command = [arg for arg in command if not (arg.startswith('-W') or
- arg.startswith('-f'))]
+ # Remove warning flags. They aren't needed and they cause trouble
+ # when clang-tidy doesn't match most recent clang.
+ # Same battle for -f (e.g. -fcomplete-member-pointers).
+ command = [
+ arg for arg in command
+ if not (arg.startswith('-W') or arg.startswith('-f'))
+ ]
- # Path from build dir.
- rel_path = os.path.relpath(os.path.abspath(filepath), out_dir)
+ # Path from build dir.
+ rel_path = os.path.relpath(os.path.abspath(filepath), out_dir)
- # Replace clang++ by clang-tidy
- command[0:1] = [GetClangTidyPath(),
- CHECKER_OPTION,
- rel_path] + args + ['--'] # Separator for clang flags.
- print "Running: %s" % ' '.join(command)
- # Run from build dir so that relative paths are correct.
- p = subprocess.Popen(command, cwd=out_dir,
- stdout=sys.stdout, stderr=sys.stderr)
- p.communicate()
- return p.returncode
- finally:
- shutil.rmtree(out_dir, ignore_errors=True)
+ # Replace clang++ by clang-tidy
+ command[0:1] = [GetClangTidyPath(), CHECKER_OPTION, rel_path
+ ] + args + ['--'] # Separator for clang flags.
+ print "Running: %s" % ' '.join(command)
+ # Run from build dir so that relative paths are correct.
+ p = subprocess.Popen(command,
+ cwd=out_dir,
+ stdout=sys.stdout,
+ stderr=sys.stderr)
+ p.communicate()
+ return p.returncode
+ finally:
+ shutil.rmtree(out_dir, ignore_errors=True)
def ValidateCC(filepath):
- """We can only analyze .cc files. Provide explicit message about that."""
- if filepath.endswith('.cc'):
- return filepath
- msg = ('%s not supported.\n'
- 'For now, we can only analyze translation units (.cc files).' %
- filepath)
- raise argparse.ArgumentTypeError(msg)
+ """We can only analyze .cc files. Provide explicit message about that."""
+ if filepath.endswith('.cc'):
+ return filepath
+ msg = ('%s not supported.\n'
+ 'For now, we can only analyze translation units (.cc files).' %
+ filepath)
+ raise argparse.ArgumentTypeError(msg)
def Main():
- description = (
- "Run clang-tidy on single cc file.\n"
- "Use flags, defines and include paths as in default debug build.\n"
- "WARNING, this is a POC version with rough edges.")
- parser = argparse.ArgumentParser(description=description)
- parser.add_argument('filepath',
- help='Specifies the path of the .cc file to analyze.',
- type=ValidateCC)
- parser.add_argument('args',
- nargs=argparse.REMAINDER,
- help='Arguments passed to clang-tidy')
- parsed_args = parser.parse_args()
- return Process(parsed_args.filepath, parsed_args.args)
+ description = (
+ "Run clang-tidy on single cc file.\n"
+ "Use flags, defines and include paths as in default debug build.\n"
+ "WARNING, this is a POC version with rough edges.")
+ parser = argparse.ArgumentParser(description=description)
+ parser.add_argument('filepath',
+ help='Specifies the path of the .cc file to analyze.',
+ type=ValidateCC)
+ parser.add_argument('args',
+ nargs=argparse.REMAINDER,
+ help='Arguments passed to clang-tidy')
+ parsed_args = parser.parse_args()
+ return Process(parsed_args.filepath, parsed_args.args)
if __name__ == '__main__':
- sys.exit(Main())
+ sys.exit(Main())