Updated to fix teh NoneType errors

Author: mbernier

sendgrid/helpers/mail/mail.py

@@ -260,16 +260,16 @@ def add_custom_arg(self, custom_arg):
 class Email(object):
 
     def __init__(self, email=None, name=None):
-        self._name(None)
-        self._email(None)
+        self._name = None
+        self._email = None
         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)
+                self.email = email
+            self.name = name
 
     @property
     def name(self):
@@ -289,11 +289,11 @@ def email(self, value):
 
     def get(self):
         email = {}
-        if self.name() is not None:
-            email["name"] = self.name()
+        if self.name is not None:
+            email["name"] = self.name
 
-        if self.email() is not None:
-            email["email"] = self.email()
+        if self.email is not None:
+            email["email"] = self.email
         return email
 
     def parse_email(self, email_info):
@@ -309,8 +309,8 @@ def parse_email(self, email_info):
         if not email:
             email = None
 
-        self.name(name)
-        self.email(email)
+        self.name = name
+        self.email = email
         return name, email
 
 class Content(object):