Use string formatting when building strings

This commit is contained in:
rubenwardy 2018-05-13 00:38:54 +01:00
parent 38ed03f49a
commit 8552796edd
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C

@ -23,7 +23,8 @@ class GithubURLMaker:
user = m.group(1) user = m.group(1)
repo = m.group(2) repo = m.group(2)
self.baseUrl = "https://raw.githubusercontent.com/" + user + "/" + repo.replace(".git", "") + "/master" self.baseUrl = "https://raw.githubusercontent.com/{}/{}/master" \
.format(user, repo.replace(".git", ""))
self.user = user self.user = user
self.repo = repo self.repo = repo
@ -31,10 +32,10 @@ class GithubURLMaker:
return self.baseUrl is not None return self.baseUrl is not None
def getRepoURL(self): def getRepoURL(self):
return "https://github.com/" + self.user + "/" + self.repo + ".git" return "https://github.com/{}/{}".format(self.user, self.repo)
def getIssueTrackerURL(self): def getIssueTrackerURL(self):
return "https://github.com/" + self.user + "/" + self.repo + "/issues/" return "https://github.com/{}/{}/issues/".format(self.user, self.repo)
def getModConfURL(self): def getModConfURL(self):
return self.baseUrl + "/mod.conf" return self.baseUrl + "/mod.conf"
@ -46,10 +47,12 @@ class GithubURLMaker:
return self.baseUrl + "/screenshot.png" return self.baseUrl + "/screenshot.png"
def getCommitsURL(self, branch): def getCommitsURL(self, branch):
return "https://api.github.com/repos/" + self.user + "/" + self.repo + "/commits?sha" + urllib.parse.quote_plus(branch) return "https://api.github.com/repos/{}/{}/commits?sha={}" \
.format(self.user, self.repo, urllib.parse.quote_plus(branch))
def getCommitDownload(self, commit): def getCommitDownload(self, commit):
return "https://github.com/" + self.user + "/" + self.repo + "/archive/" + commit + ".zip" return "https://github.com/{}/{}/archive/{}.zip" \
.format(self.user, self.repo, commit)
krock_list_cache = None krock_list_cache = None