Merge branch 'master' into update-tests

Author: mikemanger

HISTORY.md

@@ -1,6 +1,9 @@
 # createsend-python history
 
-## v8.0.0 - 5 Dec, 2024
+## v8.0.2 - 6 Dec, 2024
+* Tidy up of code from [#84](https://github.com/campaignmonitor/createsend-python/pull/84)
+
+## v8.0.1 - 5 Dec, 2024
 * No changes to actual wrapper code.
 * Release steps updated.
 

RELEASE.md

@@ -7,6 +7,10 @@
 ```
 pip install twine
 ```
+- You must install [setuptools](https://pypi.org/project/setuptools/)
+```
+pip install setuptools
+```
 
 ## Prepare the release
 

lib/createsend/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-
-# -*- coding: utf-8 -*-
 __title__ = 'createsend-python'
 __author__ = 'Campaign Monitor'
 __license__ = 'MIT'

lib/createsend/administrator.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 
 from createsend.createsend import CreateSendBase
@@ -11,7 +9,7 @@ class Administrator(CreateSendBase):
 
     def __init__(self, auth=None, email_address=None):
         self.email_address = email_address
-        super(Administrator, self).__init__(auth)
+        super().__init__(auth)
 
     def get(self, email_address=None):
         """Gets an administrator by  email address."""

lib/createsend/campaign.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 
 from createsend.createsend import CreateSendBase
@@ -11,7 +9,7 @@ class Campaign(CreateSendBase):
 
     def __init__(self, auth=None, campaign_id=None):
         self.campaign_id = campaign_id
-        super(Campaign, self).__init__(auth)
+        super().__init__(auth)
 
     def create(self, client_id, subject, name, from_name, from_email, reply_to, html_url,
                text_url, list_ids, segment_ids):
@@ -190,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/%s/%s.json" % (self.campaign_id, action)
+        return f"/campaigns/{self.campaign_id}/{action}.json"

lib/createsend/client.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 
 from createsend.createsend import CreateSendBase
@@ -11,7 +9,7 @@ class Client(CreateSendBase):
 
     def __init__(self, auth=None, client_id=None):
         self.client_id = client_id
-        super(Client, self).__init__(auth)
+        super().__init__(auth)
 
     def create(self, company, timezone, country):
         """Creates a client."""
@@ -186,4 +184,4 @@ def journeys(self):
         return json_to_py(response)
 
     def uri_for(self, action):
-        return "/clients/%s/%s.json" % (self.client_id, action)
+        return f"/clients/{self.client_id}/{action}.json"

lib/createsend/createsend.py

@@ -1,14 +1,12 @@
-from __future__ import absolute_import
-
 import sys
 import platform
 import base64
 import gzip
 import os
 import socket
 import json
-from six import BytesIO
-from six.moves.urllib.parse import parse_qs, urlencode, urlparse
+from io import BytesIO
+from urllib.parse import parse_qs, urlencode, urlparse
 
 from createsend.utils import VerifiedHTTPSConnection, json_to_py, get_faker
 
@@ -26,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 - %s: %s%s" % (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):
@@ -59,7 +57,7 @@ class ExpiredOAuthToken(Unauthorized):
     pass
 
 
-class CreateSendBase(object):
+class CreateSendBase:
     auth_details = None
     timeout = socket._GLOBAL_DEFAULT_TIMEOUT  # passed to VerifiedHTTPSConnection
 
@@ -77,7 +75,7 @@ def authorize_url(self, client_id, redirect_uri, scope, state=None):
         ]
         if state:
             params.append(('state', state))
-        return "%s?%s" % (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'
@@ -95,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 += "%s - %s" % (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]
@@ -156,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(
-                ("%s:%s" % (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(
@@ -171,7 +169,7 @@ def make_request(self, method, path, params={}, body="", username=None,
         if self.fake_web:
             # Check that the actual url which would be requested matches
             # self.faker.url.
-            actual_url = "https://%s%s" % (parsed_base_uri.netloc,
+            actual_url = "https://{}{}".format(parsed_base_uri.netloc,
                                            self.build_url(parsed_base_uri, path, params))
             self.faker.actual_url = actual_url
 
@@ -186,7 +184,7 @@ def same_urls(url_a, url_b):
                         a.fragment == b.fragment
                         )
             if not same_urls(self.faker.url, actual_url):
-                raise Exception("Faker's expected URL (%s) doesn't match actual URL (%s)" % (
+                raise Exception("Faker's expected URL ({}) doesn't match actual URL ({})".format(
                     self.faker.url, actual_url))
 
             self.faker.actual_body = body
@@ -195,7 +193,7 @@ def same_bodies(body_a, body_b):
                 return json.loads(body_a) == json.loads(body_b)
             if self.faker.body is not None:
                 if not same_bodies(self.faker.body, body):
-                    raise Exception("Faker's expected body (%s) doesn't match actual body (%s)" % (
+                    raise Exception("Faker's expected body ({}) doesn't match actual body ({})".format(
                         self.faker.body, body))
 
             data = self.faker.open() if self.faker else ''
@@ -265,7 +263,7 @@ class CreateSend(CreateSendBase):
     user_agent = default_user_agent
 
     def __init__(self, auth=None):
-        super(CreateSend, self).__init__(auth)
+        super().__init__(auth)
 
     def clients(self):
         """Gets your clients."""

lib/createsend/journey.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from createsend.createsend import CreateSendBase
 from createsend.utils import json_to_py
 
@@ -9,7 +7,7 @@ class Journey(CreateSendBase):
 
     def __init__(self, auth=None, journey_id=None):
         self.journey_id = journey_id
-        super(Journey, self).__init__(auth)
+        super().__init__(auth)
 
     def summary(self):
         """Gets the summary of the journey"""

lib/createsend/journey_email.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from createsend.createsend import CreateSendBase
 from createsend.utils import json_to_py
 
@@ -9,7 +7,7 @@ class JourneyEmail(CreateSendBase):
 
     def __init__(self, auth=None, journey_email_id=None):
         self.journey_email_id = journey_email_id
-        super(JourneyEmail, self).__init__(auth)
+        super().__init__(auth)
 
     def bounces(self, date=None, page=None, page_size=None, order_direction=None):
         """Retrieves the bounces for this journey email."""
@@ -46,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/%s/%s.json" % (self.journey_email_id, action)
+        return f"/journeys/email/{self.journey_email_id}/{action}.json"
 

lib/createsend/list.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import
-
 import json
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from createsend.createsend import CreateSendBase
 from createsend.utils import json_to_py
@@ -12,7 +10,7 @@ class List(CreateSendBase):
 
     def __init__(self, auth=None, list_id=None):
         self.list_id = list_id
-        super(List, self).__init__(auth)
+        super().__init__(auth)
 
     def create(self, client_id, title, unsubscribe_page, confirmed_opt_in,
                confirmation_success_page, unsubscribe_setting="AllClientLists"):
@@ -206,4 +204,4 @@ def deactivate_webhook(self, webhook_id):
             "webhooks/%s/deactivate" % webhook_id), ' ')
 
     def uri_for(self, action):
-        return "/lists/%s/%s.json" % (self.list_id, action)
+        return f"/lists/{self.list_id}/{action}.json"