Skip to content

Commit 70afc55

Browse files
committed
Pass github client instead of token to Repository
1 parent 8351c3c commit 70afc55

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

gitconsensus/gitconsensus.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ def createlabels(username, repository_name, color_negative, color_positive, colo
131131

132132
def get_repository(username, repository_name):
133133
credentials = config.getGitToken()
134-
return Repository(username, repository_name, credentials['token'])
134+
client = github3.login(token=credentials['token'])
135+
return Repository(username, repository_name, client)
136+
135137

136138
if __name__ == '__main__':
137139
cli()

gitconsensus/repository.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,23 @@
3131
consensus_url_template = "https://raw.githubusercontent.com/%s/%s/master/.gitconsensus.yaml"
3232

3333

34-
def githubApiRequest(url, token):
35-
headers = {
36-
'Accept': 'application/vnd.github.squirrel-girl-preview',
37-
'user-agent': 'gitconsensus',
38-
'Authorization': "token %s" % (token,)
39-
}
40-
return requests.get(url, headers=headers)
34+
def githubApiRequest(url, client):
35+
headers = {'Accept': 'application/vnd.github.squirrel-girl-preview'}
36+
return client._get(url, headers=headers)
4137

4238

4339
class Repository:
4440

45-
def __init__(self, user, repository, token=False):
41+
def __init__(self, user, repository, client):
4642
self.user = user
4743
self.name = repository
4844
self.contributors = False
4945
self.collaborators = {}
50-
self.token = token
51-
self.client = github3.login(token=token)
46+
self.client = client
5247
self.client.set_user_agent('gitconsensus')
5348
self.repository = self.client.repository(self.user, self.name)
5449
consensusurl = consensus_url_template % (self.user, self.name)
55-
res = githubApiRequest(consensusurl, self.token)
50+
res = githubApiRequest(consensusurl, self.client)
5651
self.rules = False
5752
if res.status_code == 200:
5853
self.rules = yaml.load(res.text)
@@ -106,7 +101,7 @@ def __init__(self, repository, number):
106101

107102
# https://api.github.com/repos/OWNER/REPO/issues/1/reactions
108103
reacturl = "https://api.github.com/repos/%s/%s/issues/%s/reactions" % (self.repository.user, self.repository.name, self.number)
109-
res = githubApiRequest(reacturl, self.repository.token)
104+
res = githubApiRequest(reacturl, self.repository.client)
110105
reactions = json.loads(res.text)
111106

112107
self.yes = []

0 commit comments

Comments
 (0)