Author: David Spickett Date: 2025-11-03T13:16:10Z New Revision: 1667feb0fd37b738c9134e60474741097daada25
URL: https://github.com/llvm/llvm-project/commit/1667feb0fd37b738c9134e60474741097daada25 DIFF: https://github.com/llvm/llvm-project/commit/1667feb0fd37b738c9134e60474741097daada25.diff LOG: [clang][tools] Update Python2 code in set-xcode-analyzer to Python3 (#163737) It wanted at least Python 3.6, LLVM's minimum is now 3.8, so remove this check. It was still using print as a statement, which was removed in 3.0 (https://docs.python.org/3/whatsnew/3.0.html#print-is-a-function). Exception syntax changed in 3.0 from "A, B" to "A as B" (https://docs.python.org/3/whatsnew/3.0.html#changed-syntax). Added: Modified: clang/tools/scan-build/bin/set-xcode-analyzer Removed: ################################################################################ diff --git a/clang/tools/scan-build/bin/set-xcode-analyzer b/clang/tools/scan-build/bin/set-xcode-analyzer index 8e4a5794594a6..5d98c0cf2c1e2 100755 --- a/clang/tools/scan-build/bin/set-xcode-analyzer +++ b/clang/tools/scan-build/bin/set-xcode-analyzer @@ -5,10 +5,6 @@ # This one has the scripting bridge enabled. import sys -if sys.version_info < (3, 6): - print "set-xcode-analyzer requires Python 3.6 or later" - sys.exit(1) - import os import subprocess import re @@ -18,7 +14,7 @@ import stat from AppKit import * def FindClangSpecs(path): - print "(+) Searching for xcspec file in: ", path + print("(+) Searching for xcspec file in: ", path) for root, dirs, files in os.walk(path): for f in files: if f.endswith(".xcspec") and f.startswith("Clang LLVM"): @@ -49,14 +45,14 @@ def ModifySpec(path, isBuiltinAnalyzer, pathToChecker): foundAnalyzer = False t.write(line) t.close() - print "(+) processing:", path + print("(+) processing:", path) try: shutil.copy(t.name, path) os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH) - except IOError, why: - print " (-) Cannot update file:", why, "\n" - except OSError, why: - print " (-) Cannot update file:", why, "\n" + except IOError as why: + print(" (-) Cannot update file:", why, "\n") + except OSError as why: + print(" (-) Cannot update file:", why, "\n") os.unlink(t.name) def main(): @@ -75,7 +71,7 @@ def main(): # determine if Xcode is running for x in NSWorkspace.sharedWorkspace().runningApplications(): if x.localizedName().find("Xcode") >= 0: - print "(-) You must quit Xcode first before modifying its configuration files." + print("(-) You must quit Xcode first before modifying its configuration files.") sys.exit(1) isBuiltinAnalyzer = False @@ -83,12 +79,12 @@ def main(): # Expand tildes. path = os.path.expanduser(options.path) if not path.endswith("clang"): - print "(+) Using Clang bundled with checker build:", path + print("(+) Using Clang bundled with checker build:", path) path = os.path.join(path, "bin", "clang"); else: - print "(+) Using Clang located at:", path + print("(+) Using Clang located at:", path) else: - print "(+) Using the Clang bundled with Xcode" + print("(+) Using the Clang bundled with Xcode") path = options.default isBuiltinAnalyzer = True @@ -108,7 +104,7 @@ def main(): ModifySpec(x, isBuiltinAnalyzer, path) if not foundSpec: - print "(-) No compiler configuration file was found. Xcode's analyzer has not been updated." + print("(-) No compiler configuration file was found. Xcode's analyzer has not been updated.") if __name__ == '__main__': main() _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
