|
13 | 13 |
|
14 | 14 | def get_oauth_session(user, provider):
|
15 | 15 |
|
16 |
| - tokens = SocialToken.objects.filter(account__user__username=user.username, app__provider=provider) |
| 16 | + tokens = SocialToken.objects.filter( |
| 17 | + account__user__username=user.username, app__provider=provider) |
17 | 18 | if tokens.exists():
|
18 | 19 | token = tokens[0]
|
19 | 20 | else:
|
@@ -85,7 +86,9 @@ def get_token_for_project(project, force_local=False):
|
85 | 86 | token = api.project(project.pk).token().get()['token']
|
86 | 87 | else:
|
87 | 88 | for user in project.users.all():
|
88 |
| - tokens = SocialToken.objects.filter(account__user__username=user.username, app__provider='github') |
| 89 | + tokens = SocialToken.objects.filter( |
| 90 | + account__user__username=user.username, |
| 91 | + app__provider='github') |
89 | 92 | if tokens.exists():
|
90 | 93 | token = tokens[0].token
|
91 | 94 | except Exception:
|
@@ -136,7 +139,10 @@ def import_github(user, sync):
|
136 | 139 | org_resp = session.get('https://api.github.com/orgs/%s' % org_json['login'])
|
137 | 140 | org_obj = make_github_organization(user=user, org_json=org_resp.json())
|
138 | 141 | # Add repos
|
139 |
| - org_repos_resp = github_paginate(session, 'https://api.github.com/orgs/%s/repos?per_page=100' % org_json['login']) |
| 142 | + org_repos_resp = github_paginate( |
| 143 | + session, |
| 144 | + 'https://api.github.com/orgs/%s/repos?per_page=100' % ( |
| 145 | + org_json['login'])) |
140 | 146 | for repo in org_repos_resp:
|
141 | 147 | make_github_project(user=user, org=org_obj, privacy=repo_type, repo_json=repo)
|
142 | 148 | except TypeError, e:
|
@@ -214,15 +220,21 @@ def import_bitbucket(user, sync):
|
214 | 220 | if sync and session:
|
215 | 221 | # Get user repos
|
216 | 222 | try:
|
217 |
| - owner_resp = bitbucket_paginate(session, 'https://bitbucket.org/api/2.0/repositories/{owner}'.format(owner=user.username)) |
| 223 | + owner_resp = bitbucket_paginate( |
| 224 | + session, |
| 225 | + 'https://bitbucket.org/api/2.0/repositories/{owner}'.format( |
| 226 | + owner=user.username)) |
218 | 227 | process_bitbucket_json(user, owner_resp, repo_type)
|
219 | 228 | except TypeError, e:
|
220 | 229 | print e
|
221 | 230 |
|
222 | 231 | # Get org repos
|
223 | 232 | resp = session.get('https://bitbucket.org/api/1.0/user/privileges/')
|
224 | 233 | for team in resp.json()['teams'].keys():
|
225 |
| - org_resp = bitbucket_paginate(session, 'https://bitbucket.org/api/2.0/teams/{team}/repositories'.format(team=team)) |
| 234 | + org_resp = bitbucket_paginate( |
| 235 | + session, |
| 236 | + 'https://bitbucket.org/api/2.0/teams/{team}/repositories'.format( |
| 237 | + team=team)) |
226 | 238 | process_bitbucket_json(user, org_resp, repo_type)
|
227 | 239 |
|
228 | 240 | return session is not None
|
0 commit comments