Merge branch 'master' of https://github.com/sendgrid/sendgrid-python into issue_417

Author: mbernier

README.md

@@ -180,6 +180,8 @@ Please see [our helper](https://github.com/sendgrid/sendgrid-python/tree/master/
 <a name="announcements"></a>
 # Announcements
 
+Join an experienced and passionate team that focuses on making an impact. Opportunities abound to grow the product - and grow your career! Check out our [Data Platform Engineer role](http://grnh.se/wbx1701)
+
 Please see our announcement regarding [breaking changes](https://github.com/sendgrid/sendgrid-python/issues/217). Your support is appreciated!
 
 All updates to this library are documented in our [CHANGELOG](https://github.com/sendgrid/sendgrid-python/blob/master/CHANGELOG.md) and [releases](https://github.com/sendgrid/sendgrid-python/releases). You may also subscribe to email [release notifications](https://dx.sendgrid.com/newsletter/java) for releases and breaking changes.

examples/user/user.py

@@ -49,7 +49,7 @@
 # PUT /user/password #
 
 data = {
-  "new_password": "new_password", 
+  "new_password": "new_password",
   "old_password": "old_password"
 }
 response = sg.client.user.password.put(request_body=data)
@@ -62,8 +62,8 @@
 # PATCH /user/profile #
 
 data = {
-  "city": "Orange", 
-  "first_name": "Example", 
+  "city": "Orange",
+  "first_name": "Example",
   "last_name": "User"
 }
 response = sg.client.user.profile.patch(request_body=data)
@@ -85,7 +85,7 @@
 # POST /user/scheduled_sends #
 
 data = {
-  "batch_id": "YOUR_BATCH_ID", 
+  "batch_id": "YOUR_BATCH_ID",
   "status": "pause"
 }
 response = sg.client.user.scheduled_sends.post(request_body=data)
@@ -140,7 +140,7 @@
 # PATCH /user/settings/enforced_tls #
 
 data = {
-  "require_tls": True, 
+  "require_tls": True,
   "require_valid_cert": False
 }
 response = sg.client.user.settings.enforced_tls.patch(request_body=data)
@@ -183,18 +183,18 @@
 # PATCH /user/webhooks/event/settings #
 
 data = {
-  "bounce": True, 
-  "click": True, 
-  "deferred": True, 
-  "delivered": True, 
-  "dropped": True, 
-  "enabled": True, 
-  "group_resubscribe": True, 
-  "group_unsubscribe": True, 
-  "open": True, 
-  "processed": True, 
-  "spam_report": True, 
-  "unsubscribe": True, 
+  "bounce": True,
+  "click": True,
+  "deferred": True,
+  "delivered": True,
+  "dropped": True,
+  "enabled": True,
+  "group_resubscribe": True,
+  "group_unsubscribe": True,
+  "open": True,
+  "processed": True,
+  "spam_report": True,
+  "unsubscribe": True,
   "url": "url"
 }
 response = sg.client.user.webhooks.event.settings.patch(request_body=data)
@@ -228,9 +228,9 @@
 # POST /user/webhooks/parse/settings #
 
 data = {
-  "hostname": "myhostname.com", 
-  "send_raw": False, 
-  "spam_check": True, 
+  "hostname": "myhostname.com",
+  "send_raw": False,
+  "spam_check": True,
   "url": "http://email.myhosthame.com"
 }
 response = sg.client.user.webhooks.parse.settings.post(request_body=data)
@@ -252,7 +252,7 @@
 # PATCH /user/webhooks/parse/settings/{hostname} #
 
 data = {
-  "send_raw": True, 
+  "send_raw": True,
   "spam_check": False, 
   "url": "http://newdomain.com/parse"
 }

sendgrid/helpers/mail/asm.py

@@ -9,14 +9,8 @@ def __init__(self, group_id=None, groups_to_display=None):
         :param groups_to_display: Unsubscribe groups to display
         :type groups_to_display: list(int), optional
         """
-        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):
@@ -41,6 +35,8 @@ def groups_to_display(self):
 
     @groups_to_display.setter
     def groups_to_display(self, value):
+        if value is not None and len(value) > 25:
+            raise ValueError("New groups_to_display exceeds max length of 25.")
         self._groups_to_display = value
 
     def get(self):

sendgrid/helpers/mail/bcc_settings.py

@@ -13,14 +13,8 @@ def __init__(self, enable=None, email=None):
         :param email: Who should be BCCed.
         :type email: Email, optional
         """
-        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

@@ -13,10 +13,7 @@ def __init__(self, enable=None):
         :param enable: Whether emails should bypass list management.
         :type enable: boolean, optional
         """
-        self._enable = None
-
-        if enable is not None:
-            self.enable = enable
+        self.enable = enable
 
     @property
     def enable(self):

sendgrid/helpers/mail/category.py

@@ -7,9 +7,7 @@ def __init__(self, name=None):
         :param name: The name of this category
         :type name: string, optional
         """
-        self._name = None
-        if name is not None:
-            self._name = name
+        self.name = name
 
     @property
     def name(self):

sendgrid/helpers/mail/click_tracking.py

@@ -9,14 +9,8 @@ def __init__(self, enable=None, enable_text=None):
         :param enable_text: If click tracking is on in your email's text/plain.
         :type enable_text: boolean, optional
         """
-        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

@@ -12,14 +12,8 @@ def __init__(self, type_=None, value=None):
         :param value: The actual content.
         :type value: string, optional
         """
-        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

@@ -9,14 +9,8 @@ class CustomArg(object):
 
     def __init__(self, key=None, value=None):
         """Create a CustomArg with the given key and value."""
-        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,3 +1,9 @@
+try:
+    import rfc822
+except ImportError:
+    import email.utils as rfc822
+
+
 class Email(object):
     """An email address with an optional name."""
 
@@ -11,17 +17,13 @@ def __init__(self, email=None, name=None):
         :param name: Name for this sender or recipient.
         :type name: string
         """
-        self._name = None
-        self._email = None
-        if name or email:
-            if not name:
-                # allows passing emails as "dude Fella <example@example.com>"
-                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 <example@example.com>"
+            self.parse_email(email)
+        else:
+            # allows backwards compatibility for Email(email, name)
+            self.email = email
+            self.name = name
 
     @property
     def name(self):
@@ -65,11 +67,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