Skip to content

Commit b863cc3

Browse files
committed
fix(ci): Black
1 parent a20da3b commit b863cc3

File tree

7 files changed

+33
-32
lines changed

7 files changed

+33
-32
lines changed

allauth/socialaccount/providers/cilogon/provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def extract_common_fields(self, data):
4242
email=data.get("email"),
4343
last_name=data.get("family_name"),
4444
first_name=data.get("given_name"),
45-
eppn=data.get("eppn")
45+
eppn=data.get("eppn"),
4646
)
4747

4848
def extract_email_addresses(self, data):

allauth/socialaccount/providers/cilogon/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def get_mocked_response(self):
2222
"idp_name": "Example University",
2323
"sub": "http://cilogon.org/serverA/users/1234567"
2424
}""",
25-
)
25+
)

allauth/socialaccount/providers/cilogon/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from .provider import CILogonProvider
1010

11+
1112
class CILogonOAuth2Adapter(OAuth2Adapter):
1213
provider_id = CILogonProvider.id
1314
access_token_url = "https://cilogon.org/oauth2/token"

allauth/socialaccount/providers/keycloak/views.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class KeycloakOAuth2Adapter(OAuth2Adapter):
2525
if other_url is None:
2626
other_url = settings.get("KEYCLOAK_URL")
2727

28-
server_base_url= "{0}/realms/{1}".format(
29-
other_url, settings.get("KEYCLOAK_REALM")
30-
)
28+
server_base_url = "{0}/realms/{1}".format(other_url, settings.get("KEYCLOAK_REALM"))
3129
access_token_url = "{0}/protocol/openid-connect/token".format(server_base_url)
3230
profile_url = "{0}/protocol/openid-connect/userinfo".format(server_base_url)
3331

allauth/socialaccount/providers/trainingpeaks/provider.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ def get_avatar_url(self):
1010
return None
1111

1212
def to_str(self):
13-
name = self.account.extra_data.get("FirstName") + \
14-
" " + self.account.extra_data.get("LastName")
13+
name = (
14+
self.account.extra_data.get("FirstName")
15+
+ " "
16+
+ self.account.extra_data.get("LastName")
17+
)
1518
if name != " ":
1619
return name
1720
return super(TrainingPeaksAccount, self).to_str()
1821

22+
1923
class TrainingPeaksProvider(OAuth2Provider):
2024
id = "trainingpeaks"
2125
name = "TrainingPeaks"
@@ -43,4 +47,5 @@ def extract_common_fields(self, data):
4347
def get_default_scope(self):
4448
return ["athlete:profile"]
4549

50+
4651
provider_classes = [TrainingPeaksProvider]

allauth/socialaccount/providers/trainingpeaks/tests.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,33 @@ def get_login_response_json(self, with_refresh_token=True):
5151

5252
def test_default_use_sandbox_uri(self):
5353
adapter = TrainingPeaksOAuth2Adapter(None)
54-
self.assertTrue('.sandbox.' in adapter.authorize_url)
55-
self.assertTrue('.sandbox.' in adapter.access_token_url)
56-
self.assertTrue('.sandbox.' in adapter.profile_url)
54+
self.assertTrue(".sandbox." in adapter.authorize_url)
55+
self.assertTrue(".sandbox." in adapter.access_token_url)
56+
self.assertTrue(".sandbox." in adapter.profile_url)
5757

58-
@override_settings(SOCIALACCOUNT_PROVIDERS={
59-
'trainingpeaks': {
60-
'USE_PRODUCTION': True
61-
}
62-
})
58+
@override_settings(
59+
SOCIALACCOUNT_PROVIDERS={"trainingpeaks": {"USE_PRODUCTION": True}}
60+
)
6361
def test_use_production_uri(self):
6462
adapter = TrainingPeaksOAuth2Adapter(None)
65-
self.assertFalse('.sandbox.' in adapter.authorize_url)
66-
self.assertFalse('.sandbox.' in adapter.access_token_url)
67-
self.assertFalse('.sandbox.' in adapter.profile_url)
63+
self.assertFalse(".sandbox." in adapter.authorize_url)
64+
self.assertFalse(".sandbox." in adapter.access_token_url)
65+
self.assertFalse(".sandbox." in adapter.profile_url)
6866

6967
def test_scope_from_default(self):
70-
Request = namedtuple('request', ['GET'])
68+
Request = namedtuple("request", ["GET"])
7169
mock_request = Request(GET={})
7270
scope = self.provider.get_scope(mock_request)
73-
self.assertTrue('athlete:profile' in scope)
71+
self.assertTrue("athlete:profile" in scope)
7472

75-
@override_settings(SOCIALACCOUNT_PROVIDERS={
76-
'trainingpeaks': {
77-
'SCOPE': ['athlete:profile', 'workouts', 'workouts:wod']
73+
@override_settings(
74+
SOCIALACCOUNT_PROVIDERS={
75+
"trainingpeaks": {"SCOPE": ["athlete:profile", "workouts", "workouts:wod"]}
7876
}
79-
})
77+
)
8078
def test_scope_from_settings(self):
81-
Request = namedtuple('request', ['GET'])
79+
Request = namedtuple("request", ["GET"])
8280
mock_request = Request(GET={})
8381
scope = self.provider.get_scope(mock_request)
84-
for item in ('athlete:profile', 'workouts', 'workouts:wod'):
82+
for item in ("athlete:profile", "workouts", "workouts:wod"):
8583
self.assertTrue(item in scope)

allauth/socialaccount/providers/trainingpeaks/views.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def get_settings(self):
2121
def get_hostname(self):
2222
""" Return hostname depending on sandbox seting """
2323
settings = self.get_settings()
24-
if (settings.get('USE_PRODUCTION')):
25-
return 'trainingpeaks.com'
26-
return 'sandbox.trainingpeaks.com'
24+
if settings.get("USE_PRODUCTION"):
25+
return "trainingpeaks.com"
26+
return "sandbox.trainingpeaks.com"
2727

2828
@property
2929
def access_token_url(self):
30-
return "https://oauth." + self.get_hostname() + "/oauth/token"
30+
return "https://oauth." + self.get_hostname() + "/oauth/token"
3131

3232
@property
3333
def authorize_url(self):
@@ -36,15 +36,14 @@ def authorize_url(self):
3636
@property
3737
def profile_url(self):
3838
return "https://api." + self.get_hostname() + "/v1/athlete/profile"
39-
39+
4040
@property
4141
def api_hostname(self):
4242
""" Return https://api.hostname.tld """
4343
return "https://api." + self.get_hostname()
4444

4545
# https://oauth.sandbox.trainingpeaks.com/oauth/deauthorize
4646

47-
4847
scope_delimiter = " "
4948

5049
def complete_login(self, request, app, token, **kwargs):

0 commit comments

Comments
 (0)