From b32ccbb66bb16965ecb8b4e266c4e45186636c1b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 29 Sep 2023 11:04:49 -0400 Subject: cleanup: Update codebase to expect Python 3.6 - Bump minimum version to Python 3.6. - Use f-strings in a lot of places. Change-Id: I2aa70197230fcec2eff8e7c8eb754f20c08075bb Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/389034 Tested-by: Jason R. Coombs Reviewed-by: Mike Frysinger Commit-Queue: Jason R. Coombs --- subcmds/version.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'subcmds/version.py') diff --git a/subcmds/version.py b/subcmds/version.py index 71a03608..5c817f17 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -42,35 +42,28 @@ class Version(Command, MirrorSafeCommand): # These might not be the same. Report them both. src_ver = RepoSourceVersion() rp_ver = rp.bare_git.describe(HEAD) - print("repo version %s" % rp_ver) - print(" (from %s)" % rem.url) - print(" (tracking %s)" % branch.merge) - print(" (%s)" % rp.bare_git.log("-1", "--format=%cD", HEAD)) + print(f"repo version {rp_ver}") + print(f" (from {rem.url})") + print(f" (tracking {branch.merge})") + print(f" ({rp.bare_git.log('-1', '--format=%cD', HEAD)})") if self.wrapper_path is not None: - print("repo launcher version %s" % self.wrapper_version) - print(" (from %s)" % self.wrapper_path) + print(f"repo launcher version {self.wrapper_version}") + print(f" (from {self.wrapper_path})") if src_ver != rp_ver: - print(" (currently at %s)" % src_ver) + print(f" (currently at {src_ver})") - print("repo User-Agent %s" % user_agent.repo) - print("git %s" % git.version_tuple().full) - print("git User-Agent %s" % user_agent.git) - print("Python %s" % sys.version) + print(f"repo User-Agent {user_agent.repo}") + print(f"git {git.version_tuple().full}") + print(f"git User-Agent {user_agent.git}") + print(f"Python {sys.version}") uname = platform.uname() if sys.version_info.major < 3: # Python 3 returns a named tuple, but Python 2 is simpler. print(uname) else: - print( - "OS %s %s (%s)" % (uname.system, uname.release, uname.version) - ) - print( - "CPU %s (%s)" - % ( - uname.machine, - uname.processor if uname.processor else "unknown", - ) - ) + print(f"OS {uname.system} {uname.release} ({uname.version})") + processor = uname.processor if uname.processor else "unknown" + print(f"CPU {uname.machine} ({processor})") print("Bug reports:", Wrapper().BUG_URL) -- cgit v1.2.3-54-g00ecf