Add some more f strings

Author: mikemanger

lib/createsend/campaign.py

@@ -188,4 +188,4 @@ def bounces(self, date="", page=1, page_size=1000, order_field="date", order_dir
         return json_to_py(response)
 
     def uri_for(self, action):
-        return "/campaigns/{}/{}.json".format(self.campaign_id, action)
+        return f"/campaigns/{self.campaign_id}/{action}.json"

lib/createsend/client.py

@@ -184,4 +184,4 @@ def journeys(self):
         return json_to_py(response)
 
     def uri_for(self, action):
-        return "/clients/{}/{}.json".format(self.client_id, action)
+        return f"/clients/{self.client_id}/{action}.json"

lib/createsend/createsend.py

@@ -24,7 +24,7 @@ def __str__(self):
         # self.data should contain Code, Message and optionally ResultData
         extra = ("\nExtra result data: %s" % self.data.ResultData) if hasattr(
             self.data, 'ResultData') else ""
-        return "The CreateSend API responded with the following error - {}: {}{}".format(self.data.Code, self.data.Message, extra)
+        return f"The CreateSend API responded with the following error - {self.data.Code}: {self.data.Message}{extra}"
 
 
 class ClientError(Exception):
@@ -75,7 +75,7 @@ def authorize_url(self, client_id, redirect_uri, scope, state=None):
         ]
         if state:
             params.append(('state', state))
-        return "{}?{}".format(CreateSend.oauth_uri, urlencode(params))
+        return f"{CreateSend.oauth_uri}?{urlencode(params)}"
 
     def exchange_token(self, client_id, client_secret, redirect_uri, code):
         """Exchange a provided OAuth code for an OAuth access token, 'expires in'
@@ -93,7 +93,7 @@ def exchange_token(self, client_id, client_secret, redirect_uri, code):
         r = json_to_py(response)
         if hasattr(r, 'error') and hasattr(r, 'error_description'):
             err = "Error exchanging code for access token: "
-            err += "{} - {}".format(r.error, r.error_description)
+            err += f"{r.error} - {r.error_description}"
             raise Exception(err)
         access_token, expires_in, refresh_token = r.access_token, r.expires_in, r.refresh_token
         return [access_token, expires_in, refresh_token]
@@ -154,7 +154,7 @@ def make_request(self, method, path, params={}, body="", username=None,
     overridden (e.g. when using the apikey route with username and password)."""
         if username and password:
             headers['Authorization'] = "Basic %s" % base64.b64encode(
-                ("{}:{}".format(username, password)).encode()).decode()
+                (f"{username}:{password}").encode()).decode()
         elif self.auth_details:
             if 'api_key' in self.auth_details and self.auth_details['api_key']:
                 headers['Authorization'] = "Basic %s" % base64.b64encode(

lib/createsend/journey_email.py

@@ -44,5 +44,5 @@ def get_journey_email_response(self, date, page, page_size, order_direction, uri
         return json_to_py(response)
 
     def uri_for(self, action):
-        return "/journeys/email/{}/{}.json".format(self.journey_email_id, action)
+        return f"/journeys/email/{self.journey_email_id}/{action}.json"
 

lib/createsend/list.py

@@ -204,4 +204,4 @@ def deactivate_webhook(self, webhook_id):
             "webhooks/%s/deactivate" % webhook_id), ' ')
 
     def uri_for(self, action):
-        return "/lists/{}/{}.json".format(self.list_id, action)
+        return f"/lists/{self.list_id}/{action}.json"

lib/createsend/segment.py

@@ -61,4 +61,4 @@ def delete(self):
         response = self._delete("/segments/%s.json" % self.segment_id)
 
     def uri_for(self, action):
-        return "/segments/{}/{}.json".format(self.segment_id, action)
+        return f"/segments/{self.segment_id}/{action}.json"

lib/createsend/transactional.py

@@ -18,7 +18,7 @@ def smart_email_list(self, status="all", client_id=None):
                 "/transactional/smartEmail?status=%s" % status)
         else:
             response = self._get(
-                "/transactional/smartEmail?status={}&clientID={}".format(status, client_id))
+                f"/transactional/smartEmail?status={status}&clientID={client_id}")
         return json_to_py(response)
 
     def smart_email_details(self, smart_email_id):
@@ -91,7 +91,7 @@ def message_timeline(self, params={}):
     def message_details(self, message_id, statistics=False, exclude_message_body=False):
         """Gets the details of this message."""
         response = self._get(
-            "/transactional/messages/{}?statistics={}&excludemessagebody={}".format(message_id, statistics, exclude_message_body))
+            f"/transactional/messages/{message_id}?statistics={statistics}&excludemessagebody={exclude_message_body}")
         return json_to_py(response)
 
     def message_resend(self, message_id):

lib/createsend/utils.py

@@ -143,7 +143,7 @@ def validate_consent_to_track(user_input):
         user_input = user_input.lower()
     if user_input in VALID_CONSENT_TO_TRACK_VALUES:
         return
-    raise ClientError("Consent to track value must be one of {}".format(VALID_CONSENT_TO_TRACK_VALUES))
+    raise ClientError(f"Consent to track value must be one of {VALID_CONSENT_TO_TRACK_VALUES}")
 
 
 def get_faker(expected_url, filename, status=None, body=None):
@@ -161,7 +161,7 @@ def __init__(self, expected_url, filename, status, body=None):
 
         def open(self):
             if self.filename:
-                return open("{}/../test/fixtures/{}".format(os.path.dirname(os.path.dirname(__file__)), self.filename), mode='rb').read()
+                return open(f"{os.path.dirname(os.path.dirname(__file__))}/../test/fixtures/{self.filename}", mode='rb').read()
             else:
                 return ''
 

samples/general.py

@@ -9,4 +9,4 @@
 
 # Get list of clients 
 for cl in clients:
-  print("Client: {} - Id: {}".format(cl.Name, cl.ClientID))
+  print(f"Client: {cl.Name} - Id: {cl.ClientID}")