From d4e8d65bce08c4396978edd5c61c52de537cc958 Mon Sep 17 00:00:00 2001 From: Dimitri Merejkowsky Date: Wed, 3 May 2017 17:36:50 +0200 Subject: [PATCH 1/2] fix crash during wizard --- git_repo/services/ext/github.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git_repo/services/ext/github.py b/git_repo/services/ext/github.py index ef60a6a..12071f6 100644 --- a/git_repo/services/ext/github.py +++ b/git_repo/services/ext/github.py @@ -339,7 +339,7 @@ def request_fetch(self, user, repo, request, pull=False, force=False): @classmethod def get_auth_token(cls, login, password, prompt=None): import platform - if self.fqdn != GITHUB_COM_FQDN: + if cls.fqdn != GITHUB_COM_FQDN: gh = github3.GitHubEnterprise() else: gh = github3.GitHub() @@ -359,4 +359,3 @@ def get_auth_token(cls, login, password, prompt=None): @property def user(self): return self.gh.user().login - From 896c7d9e7745efcb293a5362048d1f0b6e97f0ca Mon Sep 17 00:00:00 2001 From: Dimitri Merejkowsky Date: Wed, 3 May 2017 18:19:14 +0200 Subject: [PATCH 2/2] Fix crash when creating github requests --- git_repo/services/ext/github.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_repo/services/ext/github.py b/git_repo/services/ext/github.py index 12071f6..8bb75d8 100644 --- a/git_repo/services/ext/github.py +++ b/git_repo/services/ext/github.py @@ -237,7 +237,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N if not onto_project: raise ResourceNotFoundError('Could not find project `{}/{}`!'.format(onto_user, onto_repo)) - from_reposlug = self.guess_repo_slug(self.repository, self) + from_reposlug = self.guess_repo_slug(self.repository, self, resolve_targets=['{service}']) if from_reposlug: from_user, from_repo = from_reposlug.split('/') if (onto_user, onto_repo) == (from_user, from_repo):