Merge branch 'master' into ghost_api_update

Author: marlonkeating

common/helpers/mailing_list.py

@@ -1,5 +1,5 @@
 import threading
-from mailchimp import Mailchimp, ListDoesNotExistError, EmailNotExistsError, ListAlreadySubscribedError, Error
+from mailchimp3 import MailChimp
 from django.conf import settings
 
 
@@ -13,23 +13,33 @@ def __init__(self, email, first_name, last_name):
         thread.start()
 
     def print_error(self, err_msg):
-        err_msg = 'Failed to subscribe {first} {last}({email}) to mailing list: {err_msg}'.format(
-            first=self.first_name, last=self.last_name, email=self.email, err_msg=err_msg)
+        err_msg = "Failed to subscribe {first} {last}({email}) to mailing list: {err_msg}".format(
+            first=self.first_name,
+            last=self.last_name,
+            email=self.email,
+            err_msg=err_msg,
+        )
         print(err_msg)
 
     def run(self):
         if settings.MAILCHIMP_API_KEY is None:
-            self.print_error('MAILCHIMP_API_KEY not set')
+            self.print_error("MAILCHIMP_API_KEY not set")
             return False
 
         api_key = settings.MAILCHIMP_API_KEY
         list_id = settings.MAILCHIMP_SUBSCRIBE_LIST_ID
 
-        api = Mailchimp(api_key)
+        api = MailChimp(api_key)
         try:
-            merge_vars = {'FNAME': self.first_name, 'LNAME': self.last_name}
-            api.lists.subscribe(list_id, {'email': self.email}, merge_vars=merge_vars)
-        except (ListDoesNotExistError, EmailNotExistsError, ListAlreadySubscribedError, Error) as e:
+            merge_fields = {"FNAME": self.first_name, "LNAME": self.last_name}
+            api.lists.members.create(
+                list_id,
+                {
+                    "email_address": self.email,
+                    "status": "subscribed",
+                    "merge_fields": merge_fields,
+                },
+            )
+        except (Exception) as e:
             self.print_error(repr(e))
             return False
-

requirements.txt

@@ -19,7 +19,7 @@ djangorestframework==3.14.0
 docutils==0.14
 gunicorn==19.6.0
 jmespath==0.9.3
-mailchimp==2.0.9
+mailchimp3==3.0.21
 psycopg2==2.9.6
 psycopg2-binary==2.9.6
 python-dateutil==2.8.2