From be431874250dc05a98f3853ad56fd04a390df548 Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Fri, 16 May 2025 16:12:49 -0700 Subject: [PATCH] Modernize executable path handling in code formatting script Signed-off-by: Emmanuel Ferdman --- contrib/utilities/indent.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/contrib/utilities/indent.py b/contrib/utilities/indent.py index 6d4a9571ee..6b799bf9bf 100755 --- a/contrib/utilities/indent.py +++ b/contrib/utilities/indent.py @@ -57,8 +57,7 @@ from __future__ import print_function import argparse import time -import distutils.spawn -import distutils.file_util +import shutil import filecmp import fnmatch @@ -99,7 +98,7 @@ def parse_arguments(): "-b", "--clang-format-binary", metavar="PATH", - default=distutils.spawn.find_executable("clang-format"), + default=shutil.which("clang-format"), ) parser.add_argument( @@ -321,9 +320,7 @@ if __name__ == "__main__": os.environ["PATH"] += ( ":" + os.getcwd() + "/contrib/utilities/programs/clang-16/bin" ) - PARSED_ARGUMENTS.clang_format_binary = distutils.spawn.find_executable( - "clang-format" - ) + PARSED_ARGUMENTS.clang_format_binary = shutil.which("clang-format") # # Do not log verbose information on dry-run. -- 2.39.5