chore: use f-strings where applicable

Author: nijel

pyproject.toml

@@ -94,7 +94,6 @@ ignore = [
   "PERF203",  # WONTFIX: This rule is only enforced for Python versions prior to 3.11
   "ISC003", # TODO: Explicitly concatenated string should be implicitly concatenated
   "B028", # TODO: No explicit `stacklevel` keyword argument found
-  "UP031", # TODO: Use format specifiers instead of percent format
   "PLW0603", # TODO: Using the global statement to update `BACKENDSCACHE` is discouraged
   "TRY301", # TODO: Abstract `raise` to an inner function
   "BLE001", # TODO: Do not catch blind exception: `Exception`

social_core/backends/classlink.py

@@ -37,7 +37,7 @@ def get_user_details(self, response):
     def user_data(self, token, *args, **kwargs):
         """Loads user data from service"""
         url = "https://nodeapi.classlink.com/v2/my/info"
-        auth_header = {"Authorization": "Bearer %s" % token}
+        auth_header = {"Authorization": f"Bearer {token}"}
         try:
             return self.get_json(url, headers=auth_header)
         except ValueError:

social_core/backends/clever.py

@@ -50,11 +50,11 @@ def user_data(self, token, *args, **kwargs):
         """Loads user data from service"""
         identity_url = "https://api.clever.com/v3.0/me"
         user_details_url = "https://api.clever.com/v3.0/users"
-        auth_header = {"Authorization": "Bearer %s" % token}
+        auth_header = {"Authorization": f"Bearer {token}"}
         try:
             response = self.get_json(identity_url, headers=auth_header)
             user_id = response.get("data", {}).get("id")
-            user_details_url = "https://api.clever.com/v3.0/users/%s" % user_id
+            user_details_url = f"https://api.clever.com/v3.0/users/{user_id}"
             return self.get_json(user_details_url, headers=auth_header)
         except ValueError:
             return None

social_core/backends/digitalocean.py

@@ -36,7 +36,7 @@ def get_user_details(self, response):
     def user_data(self, token, *args, **kwargs):
         """Loads user data from service"""
         url = "https://api.digitalocean.com/v2/account"
-        auth_header = {"Authorization": "Bearer %s" % token}
+        auth_header = {"Authorization": f"Bearer {token}"}
         try:
             return self.get_json(url, headers=auth_header)
         except ValueError:

social_core/backends/discord.py

@@ -9,10 +9,10 @@
 class DiscordOAuth2(BaseOAuth2):
     name = "discord"
     HOSTNAME = "discord.com"
-    AUTHORIZATION_URL = "https://%s/api/oauth2/authorize" % HOSTNAME
-    ACCESS_TOKEN_URL = "https://%s/api/oauth2/token" % HOSTNAME
+    AUTHORIZATION_URL = f"https://{HOSTNAME}/api/oauth2/authorize"
+    ACCESS_TOKEN_URL = f"https://{HOSTNAME}/api/oauth2/token"
     ACCESS_TOKEN_METHOD = "POST"
-    REVOKE_TOKEN_URL = "https://%s/api/oauth2/token/revoke" % HOSTNAME
+    REVOKE_TOKEN_URL = f"https://{HOSTNAME}/api/oauth2/token/revoke"
     REVOKE_TOKEN_METHOD = "GET"
     DEFAULT_SCOPE = ["identify"]
     SCOPE_SEPARATOR = "+"
@@ -26,6 +26,6 @@ def get_user_details(self, response):
         }
 
     def user_data(self, access_token, *args, **kwargs):
-        url = "https://%s/api/users/@me" % self.HOSTNAME
-        auth_header = {"Authorization": "Bearer %s" % access_token}
+        url = f"https://{self.HOSTNAME}/api/users/@me"
+        auth_header = {"Authorization": f"Bearer {access_token}"}
         return self.get_json(url, headers=auth_header)

social_core/backends/docker.py

@@ -42,6 +42,6 @@ def user_data(self, access_token, *args, **kwargs):
         """Grab user profile information from Docker Hub."""
         username = kwargs["response"]["username"]
         return self.get_json(
-            "https://hub.docker.com/api/v1.1/users/%s/" % username,
-            headers={"Authorization": "Bearer %s" % access_token},
+            f"https://hub.docker.com/api/v1.1/users/{username}/",
+            headers={"Authorization": f"Bearer {access_token}"},
         )

social_core/backends/drip.py

@@ -25,5 +25,5 @@ def get_user_details(self, response):
     def user_data(self, access_token, *args, **kwargs):
         return self.get_json(
             "https://api.getdrip.com/v2/user",
-            headers={"Authorization": "Bearer %s" % access_token},
+            headers={"Authorization": f"Bearer {access_token}"},
         )

social_core/backends/fitbit.py

@@ -54,7 +54,7 @@ def get_user_details(self, response):
 
     def user_data(self, access_token, *args, **kwargs):
         """Loads user data from service"""
-        auth_header = {"Authorization": "Bearer %s" % access_token}
+        auth_header = {"Authorization": f"Bearer {access_token}"}
         return self.get_json(
             "https://api.fitbit.com/1/user/-/profile.json", headers=auth_header
         )["user"]

social_core/backends/google.py

@@ -45,7 +45,7 @@ def user_data(self, access_token, *args, **kwargs):
         return self.get_json(
             "https://www.googleapis.com/oauth2/v3/userinfo",
             headers={
-                "Authorization": "Bearer %s" % access_token,
+                "Authorization": f"Bearer {access_token}",
             },
         )
 

social_core/backends/mineid.py

@@ -19,7 +19,7 @@ def user_data(self, access_token, *args, **kwargs):
         return self._user_data(access_token)
 
     def _user_data(self, access_token, path=None):
-        url = "%(scheme)s://%(host)s/api/user" % self.get_mineid_url_params()
+        url = "{scheme}://{host}/api/user".format(**self.get_mineid_url_params())
         return self.get_json(url, params={"access_token": access_token})
 
     @property

social_core/backends/paypal.py

@@ -22,7 +22,7 @@ class PayPalOAuth2(BaseOAuth2):
     REDIRECT_STATE = False
 
     def user_data(self, access_token, *args, **kwargs):
-        auth_header = {"Authorization": "Bearer %s" % access_token}
+        auth_header = {"Authorization": f"Bearer {access_token}"}
         return self.get_json(self.USER_DATA_URL, headers=auth_header)
 
     def get_user_details(self, response):
@@ -49,7 +49,7 @@ def auth_complete_params(self, state=None):
         }
 
     def auth_headers(self):
-        auth = ("%s:%s" % self.get_key_and_secret()).encode()
+        auth = ("{}:{}".format(*self.get_key_and_secret())).encode()
         return {"Authorization": b"Basic " + base64.urlsafe_b64encode(auth)}
 
     def refresh_token_params(self, token, *args, **kwargs):

social_core/backends/pocket.py

@@ -33,7 +33,7 @@ def auth_url(self):
         token = self.get_json(self.REQUEST_TOKEN_URL, data=data)["code"]
         self.strategy.session_set("pocket_request_token", token)
         bits = (self.AUTHORIZATION_URL, token, self.redirect_uri)
-        return "%s?request_token=%s&redirect_uri=%s" % bits
+        return "{}?request_token={}&redirect_uri={}".format(*bits)
 
     @handle_http_errors
     def auth_complete(self, *args, **kwargs):

social_core/backends/podio.py

@@ -28,7 +28,7 @@ def get_user_details(self, response):
             response["profile"]["name"]
         )
         return {
-            "username": "user_%d" % response["user"]["user_id"],
+            "username": f"user_{response['user']['user_id']}",
             "email": response["user"]["mail"],
             "fullname": fullname,
             "first_name": first_name,

social_core/backends/shimmering.py

@@ -31,7 +31,7 @@ def get_user_details(self, response):
 
     def user_data(self, access_token, *args, **kwargs):
         """Loads user data from service"""
-        headers = {"Authorization": "Bearer %s" % access_token}
+        headers = {"Authorization": f"Bearer {access_token}"}
         return self.get_json(
             "http://developers.shimmeringverify.com/user_info/", headers=headers
         )

social_core/backends/slack.py

@@ -51,7 +51,7 @@ def user_data(self, access_token, *args, **kwargs):
         """Loads user data from service"""
         response = self.get_json(
             "https://slack.com/api/users.identity",
-            headers={"Authorization": "Bearer %s" % access_token},
+            headers={"Authorization": f"Bearer {access_token}"},
         )
         if not response.get("id", None):
             response["id"] = response["user"]["id"]

social_core/backends/twitch.py

@@ -63,7 +63,7 @@ def get_user_details(self, response):
     def user_data(self, access_token, *args, **kwargs):
         client_id, _ = self.get_key_and_secret()
         auth_headers = {
-            "Authorization": "Bearer %s" % access_token,
+            "Authorization": f"Bearer {access_token}",
             "Client-Id": client_id,
         }
         url = "https://api.twitch.tv/helix/users"

social_core/backends/twitter_oauth2.py

@@ -99,6 +99,6 @@ def user_data(self, access_token, *args, **kwargs):
         response = self.get_json(
             "https://api.twitter.com/2/users/me",
             params={"user.fields": ",".join(fields)},
-            headers={"Authorization": "Bearer %s" % access_token},
+            headers={"Authorization": f"Bearer {access_token}"},
         )
         return response["data"]