replace .format() with f strings

spotipy-dev · Dec 13, 2024 · 4b486f8 · 4b486f8
1 parent 0fba1a1
commit 4b486f8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 45 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -145,7 +145,7 @@ class SpotifyClientCredentials that can be used to authenticate requests like so
     playlists = sp.user_playlists('spotify')
     while playlists:
         for i, playlist in enumerate(playlists['items']):
-            print("{:4d} {} {}".format(i + 1 + playlists['offset'], playlist['uri'],  playlist['name']))
+            print(f"{i + 1 + playlists['offset']:4d} {playlist['uri']} {playlist['name']}")
         if playlists['next']:
             playlists = sp.next(playlists)
         else:

diff --git a/examples/artist_discography.py b/examples/artist_discography.py
@@ -55,7 +55,7 @@ def show_artist(artist):
     logger.info(f'===={artist["name"]}====')
     logger.info(f'Popularity: {artist["popularity"]}')
     if len(artist['genres']) > 0:
-        logger.info('Genres: {}'.format(','.join(artist['genres'])))
+        logger.info(f"Genres: {', '.join(artist['genres'])}")
 
 
 def main():

diff --git a/examples/track_recommendations.py b/examples/track_recommendations.py
@@ -38,8 +38,5 @@
 
 # Display the recommendations
 for i, track in enumerate(recommendations['tracks']):
-    print(
-        "{}. {} by {}"
-        .format(i+1, track['name'], ', '
-                .join([artist['name'] for artist in track['artists']]))
-    )
+    print(f"{i+1}. {track['name']} by "
+          f"{', '.join([artist['name'] for artist in track['artists']])}")
diff --git a/spotipy/client.py b/spotipy/client.py
@@ -263,8 +263,8 @@ def _internal_call(self, method, url, payload, params):
         if self.language is not None:
             headers["Accept-Language"] = self.language
 
-        logger.debug('Sending {} to {} with Params: {} Headers: {} and Body: {!r} '.format(
-                method, url, args.get("params"), headers, args.get('data')))
+        logger.debug(f"Sending {method} to {url} with Params: "
+                     f"{args.get('params')} Headers: {headers} and Body: {args.get('data')!r}")
 
         try:
             response = self._session.request(
@@ -289,11 +289,8 @@ def _internal_call(self, method, url, payload, params):
                 msg = response.text or None
                 reason = None
 
-            logger.error(
-                'HTTP Error for {} to {} with Params: {} returned {} due to {}'.format(
-                    method, url, args.get("params"), response.status_code, msg
-                )
-            )
+            logger.error(f"HTTP Error for {method} to {url} with Params: "
+                         f"{args.get('params')} returned {response.status_code} due to {msg}")
 
             raise SpotifyException(
                 response.status_code,
@@ -2035,11 +2032,9 @@ def _is_uri(self, uri):
     def _search_multiple_markets(self, q, limit, offset, type, markets, total):
         if total and limit > total:
             limit = total
-            warnings.warn(
-                "limit was auto-adjusted to equal {} as it must not be higher than total".format(
-                    total),
-                UserWarning,
-            )
+            warnings.warn(f"limit was auto-adjusted to equal {total} "
+                          f"as it must not be higher than total",
+                          UserWarning)
 
         results = defaultdict(dict)
         item_types = [item_type + "s" for item_type in type.split(",")]

diff --git a/spotipy/exceptions.py b/spotipy/exceptions.py
@@ -16,8 +16,9 @@ def __init__(self, http_status, code, msg, reason=None, headers=None):
         self.headers = headers
 
     def __str__(self):
-        return 'http status: {}, code:{} - {}, reason: {}'.format(
-            self.http_status, self.code, self.msg, self.reason)
+        return (f"http status: {self.http_status}, "
+                f"code: {self.code} - {self.msg}, "
+                f"reason: {self.reason}")
 
 
 class SpotifyOauthError(SpotifyBaseException):

diff --git a/spotipy/oauth2.py b/spotipy/oauth2.py
@@ -217,10 +217,8 @@ def _request_access_token(self):
             self.client_id, self.client_secret
         )
 
-        logger.debug(
-            "Sending POST request to {} with Headers: {} and Body: {!r}".format(
-                self.OAUTH_TOKEN_URL, headers, payload)
-        )
+        logger.debug(f"Sending POST request to {self.OAUTH_TOKEN_URL} with Headers: "
+                     f"{headers} and Body: {payload}")
 
         try:
             response = self._session.post(
@@ -509,10 +507,8 @@ def get_access_token(self, code=None, as_dict=True, check_cache=True):
 
         headers = self._make_authorization_headers()
 
-        logger.debug(
-            "Sending POST request to {} with Headers: {} and Body: {!r}".format(
-                self.OAUTH_TOKEN_URL, headers, payload)
-        )
+        logger.debug(f"Sending POST request to {self.OAUTH_TOKEN_URL} with Headers: "
+                     f"{headers} and Body: {payload}")
 
         try:
             response = self._session.post(
@@ -539,10 +535,8 @@ def refresh_access_token(self, refresh_token):
 
         headers = self._make_authorization_headers()
 
-        logger.debug(
-            "Sending POST request to {} with Headers: {} and Body: {!r}".format(
-                self.OAUTH_TOKEN_URL, headers, payload)
-        )
+        logger.debug(f"Sending POST request to {self.OAUTH_TOKEN_URL} with Headers: "
+                     f"{headers} and Body: {payload}")
 
         try:
             response = self._session.post(
@@ -786,10 +780,8 @@ def _get_auth_response_interactive(self, open_browser=False):
             prompt = "Enter the URL you were redirected to: "
         else:
             url = self.get_authorize_url()
-            prompt = (
-                "Go to the following URL: {}\n"
-                "Enter the URL you were redirected to: ".format(url)
-            )
+            prompt = (f"Go to the following URL: {url}\n"
+                      f"Enter the URL you were redirected to: ")
         response = self._get_user_input(prompt)
         state, code = self.parse_auth_response_url(response)
         if self.state is not None and self.state != state:
@@ -865,10 +857,8 @@ def get_access_token(self, code=None, check_cache=True):
 
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
 
-        logger.debug(
-            "Sending POST request to {} with Headers: {} and Body: {!r}".format(
-                self.OAUTH_TOKEN_URL, headers, payload)
-        )
+        logger.debug(f"Sending POST request to {self.OAUTH_TOKEN_URL} with Headers: "
+                     f"{headers} and Body: {payload}")
 
         try:
             response = self._session.post(
@@ -896,10 +886,8 @@ def refresh_access_token(self, refresh_token):
 
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
 
-        logger.debug(
-            "Sending POST request to {} with Headers: {} and Body: {!r}".format(
-                self.OAUTH_TOKEN_URL, headers, payload)
-        )
+        logger.debug(f"Sending POST request to {self.OAUTH_TOKEN_URL} with Headers: "
+                     f"{headers} and Body: {payload}")
 
         try:
             response = self._session.post(