Python style fixes

sendgrid/helpers/mail/asm.py

@@ -1,14 +1,8 @@
 class ASM(object):
 
     def __init__(self, group_id=None, groups_to_display=None):
-        self._group_id = None
-        self._groups_to_display = None
-
-        if group_id is not None:
-            self._group_id = group_id
-
-        if groups_to_display is not None:
-            self._groups_to_display = groups_to_display
+        self._group_id = group_id
+        self._groups_to_display = groups_to_display
 
     @property
     def group_id(self):

sendgrid/helpers/mail/bcc_settings.py

@@ -1,14 +1,8 @@
 class BCCSettings(object):
 
     def __init__(self, enable=None, email=None):
-        self._enable = None
-        self._email = None
-
-        if enable is not None:
-            self.enable = enable
-
-        if email is not None:
-            self.email = email
+        self.enable = enable
+        self.email = email
 
     @property
     def enable(self):

sendgrid/helpers/mail/bypass_list_management.py

@@ -1,10 +1,7 @@
 class BypassListManagement(object):
 
     def __init__(self, enable=None):
-        self._enable = None
-
-        if enable is not None:
-            self.enable = enable
+        self.enable = enable
 
     @property
     def enable(self):

sendgrid/helpers/mail/category.py

@@ -1,9 +1,7 @@
 class Category(object):
 
     def __init__(self, name=None):
-        self._name = None
-        if name is not None:
-            self._name = name
+        self._name = name
 
     @property
     def name(self):

sendgrid/helpers/mail/click_tracking.py

@@ -1,14 +1,8 @@
 class ClickTracking(object):
 
     def __init__(self, enable=None, enable_text=None):
-        self._enable = None
-        self._enable_text = None
-
-        if enable is not None:
-            self.enable = enable
-
-        if enable_text is not None:
-            self.enable_text = enable_text
+        self.enable = enable
+        self.enable_text = enable_text
 
     @property
     def enable(self):

sendgrid/helpers/mail/content.py

@@ -1,14 +1,8 @@
 class Content(object):
 
     def __init__(self, type_=None, value=None):
-        self._type = None
-        self._value = None
-
-        if type_ is not None:
-            self.type = type_
-
-        if value is not None:
-            self.value = value
+        self.type = type_
+        self.value = value
 
     @property
     def type(self):

sendgrid/helpers/mail/custom_arg.py

@@ -1,14 +1,8 @@
 class CustomArg(object):
 
     def __init__(self, key=None, value=None):
-        self._key = None
-        self._value = None
-
-        if key is not None:
-            self.key = key
-
-        if value is not None:
-            self.value = value
+        self.key = key
+        self.value = value
 
     @property
     def key(self):

sendgrid/helpers/mail/email.py

@@ -1,17 +1,19 @@
+try:
+    import rfc822
+except ImportError:
+    import email.utils as rfc822
+
+
 class Email(object):
 
     def __init__(self, email=None, name=None):
-        self._name = None
-        self._email = None
-        if name or email:
-            if not name:
-                # allows passing emails as "dude Fella <[email protected]>"
-                self.parse_email(email)
-            else:
-                #allows backwards compatibility for Email(email, name)
-                if email is not None:
-                    self.email = email
-                self.name = name
+        if email and not name:
+            # allows passing emails as "dude Fella <[email protected]>"
+            self.parse_email(email)
+        else:
+            # allows backwards compatibility for Email(email, name)
+            self.email = email
+            self.name = name
 
     @property
     def name(self):
@@ -39,11 +41,6 @@ def get(self):
         return email
 
     def parse_email(self, email_info):
-        try:
-            import rfc822
-        except ImportError:
-            import email.utils as rfc822
-
         name, email = rfc822.parseaddr(email_info)
 
         # more than likely a string was passed here instead of an email address

sendgrid/helpers/mail/footer_settings.py

@@ -1,18 +1,9 @@
 class FooterSettings(object):
 
     def __init__(self, enable=None, text=None, html=None):
-        self._enable = None
-        self._text = None
-        self._html = None
-
-        if enable is not None:
-            self.enable = enable
-
-        if text is not None:
-            self.text = text
-
-        if html is not None:
-            self.html = html
+        self.enable = enable
+        self.text = text
+        self.html = html
 
     @property
     def enable(self):

sendgrid/helpers/mail/ganalytics.py

@@ -7,25 +7,12 @@ def __init__(self,
                  utm_term=None,
                  utm_content=None,
                  utm_campaign=None):
-        self._enable = None
-        self._utm_source = None
-        self._utm_medium = None
-        self._utm_term = None
-        self._utm_content = None
-        self._utm_campaign = None
-
-        if enable is not None:
-            self.enable = enable
-        if utm_source is not None:
-            self.utm_source = utm_source
-        if utm_medium is not None:
-            self.utm_medium = utm_medium
-        if utm_term is not None:
-            self.utm_term = utm_term
-        if utm_content is not None:
-            self.utm_content = utm_content
-        if utm_campaign is not None:
-            self.utm_campaign = utm_campaign
+        self.enable = enable
+        self.utm_source = utm_source
+        self.utm_medium = utm_medium
+        self.utm_term = utm_term
+        self.utm_content = utm_content
+        self.utm_campaign = utm_campaign
 
     @property
     def enable(self):

sendgrid/helpers/mail/header.py

@@ -1,13 +1,8 @@
 class Header(object):
 
     def __init__(self, key=None, value=None):
-        self._key = None
-        self._value = None
-
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
+        self.key = key
+        self.value = value
 
     @property
     def key(self):

sendgrid/helpers/mail/mail.py

@@ -16,13 +16,13 @@ def __init__(
         self._mail_settings = None
         self._tracking_settings = None
         self._reply_to = None
-        self._personalizations = None
-        self._contents = None
-        self._attachments = None
-        self._sections = None
-        self._headers = None
-        self._categories = None
-        self._custom_args = None
+        self._personalizations = []
+        self._contents = []
+        self._attachments = []
+        self._sections = []
+        self._headers = []
+        self._categories = []
+        self._custom_args = []
 
         # Minimum required to send an email
         if from_email and subject and to_email and content:
@@ -46,38 +46,38 @@ def get(self):
         if self.subject is not None:
             mail["subject"] = self.subject
 
-        if self.personalizations is not None:
+        if self.personalizations:
             mail["personalizations"] = [
                 personalization.get()
                 for personalization in self.personalizations
             ]
 
-        if self.contents is not None:
+        if self.contents:
             mail["content"] = [ob.get() for ob in self.contents]
 
-        if self.attachments is not None:
+        if self.attachments:
             mail["attachments"] = [ob.get() for ob in self.attachments]
 
         if self.template_id is not None:
             mail["template_id"] = self.template_id
 
-        if self.sections is not None:
+        if self.sections:
             sections = {}
             for key in self.sections:
                 sections.update(key.get())
             mail["sections"] = sections
 
-        if self.headers is not None:
+        if self.headers:
             headers = {}
             for key in self.headers:
                 headers.update(key.get())
             mail["headers"] = headers
 
-        if self.categories is not None:
+        if self.categories:
             mail["categories"] = [category.get() for category in
                                   self.categories]
 
-        if self.custom_args is not None:
+        if self.custom_args:
             custom_args = {}
             for key in self.custom_args:
                 custom_args.update(key.get())
@@ -190,44 +190,34 @@ def personalizations(self):
         return self._personalizations
 
     def add_personalization(self, personalizations):
-        if self._personalizations is None:
-            self._personalizations = []
         self._personalizations.append(personalizations)
 
     @property
     def contents(self):
         return self._contents
 
     def add_content(self, content):
-        if self._contents is None:
-            self._contents = []
         self._contents.append(content)
 
     @property
     def attachments(self):
         return self._attachments
 
     def add_attachment(self, attachment):
-        if self._attachments is None:
-            self._attachments = []
         self._attachments.append(attachment)
 
     @property
     def sections(self):
         return self._sections
 
     def add_section(self, section):
-        if self._sections is None:
-            self._sections = []
         self._sections.append(section)
 
     @property
     def headers(self):
         return self._headers
 
     def add_header(self, header):
-        if self._headers is None:
-            self._headers = []
         if isinstance(header, dict):
             (k, v) = list(header.items())[0]
             self._headers.append(Header(k, v))
@@ -239,15 +229,11 @@ def categories(self):
         return self._categories
 
     def add_category(self, category):
-        if self._categories is None:
-            self._categories = []
         self._categories.append(category)
 
     @property
     def custom_args(self):
         return self._custom_args
 
     def add_custom_arg(self, custom_arg):
-        if self._custom_args is None:
-            self._custom_args = []
         self._custom_args.append(custom_arg)

sendgrid/helpers/mail/open_tracking.py

@@ -1,13 +1,8 @@
 class OpenTracking(object):
 
     def __init__(self, enable=None, substitution_tag=None):
-        self._enable = None
-        self._substitution_tag = None
-
-        if enable is not None:
-            self.enable = enable
-        if substitution_tag is not None:
-            self.substitution_tag = substitution_tag
+        self.enable = enable
+        self.substitution_tag = substitution_tag
 
     @property
     def enable(self):