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 --- git_config.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'git_config.py') diff --git a/git_config.py b/git_config.py index 6aa8d855..68016fff 100644 --- a/git_config.py +++ b/git_config.py @@ -418,7 +418,7 @@ class GitConfig: if p.Wait() == 0: return p.stdout else: - raise GitError("git config %s: %s" % (str(args), p.stderr)) + raise GitError(f"git config {str(args)}: {p.stderr}") class RepoConfig(GitConfig): @@ -651,13 +651,11 @@ class Remote: userEmail, host, port ) except urllib.error.HTTPError as e: - raise UploadError("%s: %s" % (self.review, str(e))) + raise UploadError(f"{self.review}: {str(e)}") except urllib.error.URLError as e: - raise UploadError("%s: %s" % (self.review, str(e))) + raise UploadError(f"{self.review}: {str(e)}") except http.client.HTTPException as e: - raise UploadError( - "%s: %s" % (self.review, e.__class__.__name__) - ) + raise UploadError(f"{self.review}: {e.__class__.__name__}") REVIEW_CACHE[u] = self._review_url return self._review_url + self.projectname @@ -666,7 +664,7 @@ class Remote: username = self._config.GetString("review.%s.username" % self.review) if username is None: username = userEmail.split("@")[0] - return "ssh://%s@%s:%s/" % (username, host, port) + return f"ssh://{username}@{host}:{port}/" def ToLocal(self, rev): """Convert a remote revision string to something we have locally.""" @@ -715,11 +713,11 @@ class Remote: self._Set("fetch", list(map(str, self.fetch))) def _Set(self, key, value): - key = "remote.%s.%s" % (self.name, key) + key = f"remote.{self.name}.{key}" return self._config.SetString(key, value) def _Get(self, key, all_keys=False): - key = "remote.%s.%s" % (self.name, key) + key = f"remote.{self.name}.{key}" return self._config.GetString(key, all_keys=all_keys) @@ -762,11 +760,11 @@ class Branch: fd.write("\tmerge = %s\n" % self.merge) def _Set(self, key, value): - key = "branch.%s.%s" % (self.name, key) + key = f"branch.{self.name}.{key}" return self._config.SetString(key, value) def _Get(self, key, all_keys=False): - key = "branch.%s.%s" % (self.name, key) + key = f"branch.{self.name}.{key}" return self._config.GetString(key, all_keys=all_keys) -- cgit v1.2.3-54-g00ecf