Updated example data

thinkingserious · thinkingserious · commit c29cfcc0a686 · 2016-05-11T20:01:07.000-07:00
diff --git a/README.md b/README.md
@@ -43,9 +43,9 @@ source ./sendgrid.env
 import sendgrid
 from sendgrid.helpers.mail import *
 
-from_email = Email("dx@sendgrid.com")
+from_email = Email("test@example.com")
 subject = "Hello World from the SendGrid Python Library"
-to_email = Email("elmer.thomas@sendgrid.com")
+to_email = Email("test@example.com")
 content = Content("text/plain", "some text here")
 mail = Mail(from_email, subject, to_email, content)
 response = sg.client.mail.send.beta.post(request_body=mail.get())
diff --git a/examples/helpers/mail/mail_example.py b/examples/helpers/mail/mail_example.py
@@ -8,52 +8,52 @@
 
 def build_hello_email():
     """Minimum required to send an email"""
-    from_email = Email("dx@sendgrid.com")
+    from_email = Email("test@example.com")
     subject = "Hello World from the SendGrid Python Library"
-    to_email = Email("elmer.thomas@sendgrid.com")
+    to_email = Email("test@example.com")
     content = Content("text/plain", "some text here")
     mail = Mail(from_email, subject, to_email, content)
-    mail.personalizations[0].add_to(Email("elmer.thomas+add_second_email@sendgrid.com"))
+    mail.personalizations[0].add_to(Email("test@example.com"))
 
     return mail.get()
 
 def build_kitchen_sink():
     """All settings set"""
     mail = Mail()
 
-    mail.set_from(Email("dx@sendgrid.com", "Elmer Thomas"))
+    mail.set_from(Email("test@example.com", "Example User"))
 
     mail.set_subject("Hello World from the SendGrid Python Library")
 
     personalization = Personalization()
-    personalization.add_to(Email("elmer.thomas@sendgrid.com", "Elmer Thomas"))
-    personalization.add_to(Email("elmer.thomas@gmail.com", "Elmer Thomas Alias"))
-    personalization.add_cc(Email("matt.bernier@sendgrid.com", "Matt Bernier"))
-    personalization.add_cc(Email("eric.shallock@sendgrid.com", "Eric Shallock"))
-    personalization.add_bcc(Email("matt.bernier+dx@sendgrid.com"))
-    personalization.add_bcc(Email("eric.shallock+dx@sendgrid.com"))
+    personalization.add_to(Email("test@example.com", "Example User"))
+    personalization.add_to(Email("test@example.com", "Example User"))
+    personalization.add_cc(Email("test@example.com", "Example User"))
+    personalization.add_cc(Email("test@example.com", "Example User"))
+    personalization.add_bcc(Email("test@example.com"))
+    personalization.add_bcc(Email("test@example.com"))
     personalization.set_subject("Hello World from the Personalized SendGrid Python Library")
     personalization.add_header(Header("X-Test", "test"))
     personalization.add_header(Header("X-Mock", "true"))
-    personalization.add_substitution(Substitution("%name%", "Tim"))
-    personalization.add_substitution(Substitution("%city%", "Riverside"))
+    personalization.add_substitution(Substitution("%name%", "Example User"))
+    personalization.add_substitution(Substitution("%city%", "Denver"))
     personalization.add_custom_arg(CustomArg("user_id", "343"))
     personalization.add_custom_arg(CustomArg("type", "marketing"))
     personalization.set_send_at(1443636843)
     mail.add_personalization(personalization)
 
     personalization2 = Personalization()
-    personalization2.add_to(Email("elmer.thomas@sendgrid.com", "Elmer Thomas"))
-    personalization2.add_to(Email("elmer.thomas@gmail.com", "Elmer Thomas Alias"))
-    personalization2.add_cc(Email("matt.bernier@sendgrid.com", "Matt Bernier"))
-    personalization2.add_cc(Email("eric.shallock@sendgrid.com", "Eric Shallock"))
-    personalization2.add_bcc(Email("matt.bernier+dx@sendgrid.com"))
-    personalization2.add_bcc(Email("eric.shallock+dx@sendgrid.com"))
+    personalization2.add_to(Email("test@example.com", "Example User"))
+    personalization2.add_to(Email("test@example.com", "Example User"))
+    personalization2.add_cc(Email("test@example.com", "Example User"))
+    personalization2.add_cc(Email("test@example.com", "Eric Shallock"))
+    personalization2.add_bcc(Email("test@example.com"))
+    personalization2.add_bcc(Email("test@example.com"))
     personalization2.set_subject("Hello World from the Personalized SendGrid Python Library")
     personalization2.add_header(Header("X-Test", "test"))
     personalization2.add_header(Header("X-Mock", "true"))
-    personalization2.add_substitution(Substitution("%name%", "Tim"))
-    personalization2.add_substitution(Substitution("%city%", "Riverside"))
+    personalization2.add_substitution(Substitution("%name%", "Example User"))
+    personalization2.add_substitution(Substitution("%city%", "Denver"))
     personalization2.add_custom_arg(CustomArg("user_id", "343"))
     personalization2.add_custom_arg(CustomArg("type", "marketing"))
     personalization2.set_send_at(1443636843)
@@ -102,7 +102,7 @@ def build_kitchen_sink():
     mail.set_ip_pool_name("24")
 
     mail_settings = MailSettings()
-    mail_settings.set_bcc_settings(BCCSettings(True, Email("dx+reply@sendgrid.com")))
+    mail_settings.set_bcc_settings(BCCSettings(True, Email("test@example.com")))
     mail_settings.set_bypass_list_management(BypassListManagement(True))
     mail_settings.set_footer_settings(FooterSettings(True, "Footer Text", "<html><body>Footer Text</body></html>"))
     mail_settings.set_sandbox_mode(SandBoxMode(True))
@@ -116,7 +116,7 @@ def build_kitchen_sink():
     tracking_settings.set_ganalytics(Ganalytics(True, "some source", "some medium", "some term", "some_content", "some_campaign"))
     mail.set_tracking_settings(tracking_settings)
 
-    mail.set_reply_to(Email("dx+reply@sendgrid.com"))
+    mail.set_reply_to(Email("test@example.com"))
 
     return mail.get()
 
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     long_description = open('README.txt').read()
 
 def getRequires():
-    deps = ['smtpapi==0.3.1', 'python_http_client==1.2.3']
+    deps = ['python_http_client==1.2.3']
     if sys.version_info < (2, 7):
         deps.append('unittest2')
     elif (3, 0) <= sys.version_info < (3, 2):
diff --git a/test/test_mail.py b/test/test_mail.py
@@ -16,58 +16,58 @@ def test_helloEmail(self):
         """Minimum required to send an email"""
         mail = Mail()
 
-        mail.set_from(Email("dx@sendgrid.com"))
+        mail.set_from(Email("test@example.com"))
 
         mail.set_subject("Hello World from the SendGrid Python Library")
 
         personalization = Personalization()
-        personalization.add_to(Email("elmer.thomas@sendgrid.com"))
+        personalization.add_to(Email("test@example.com"))
         mail.add_personalization(personalization)
 
         mail.add_content(Content("text/plain", "some text here"))
         mail.add_content(Content("text/html", "<html><body>some text here</body></html>"))
 
-        self.assertEqual(json.dumps(mail.get(), sort_keys=True), '{"content": [{"type": "text/plain", "value": "some text here"}, {"type": "text/html", "value": "<html><body>some text here</body></html>"}], "from": {"email": "dx@sendgrid.com"}, "personalizations": [{"to": [{"email": "elmer.thomas@sendgrid.com"}]}], "subject": "Hello World from the SendGrid Python Library"}')
+        self.assertEqual(json.dumps(mail.get(), sort_keys=True), '{"content": [{"type": "text/plain", "value": "some text here"}, {"type": "text/html", "value": "<html><body>some text here</body></html>"}], "from": {"email": "test@example.com"}, "personalizations": [{"to": [{"email": "test@example.com"}]}], "subject": "Hello World from the SendGrid Python Library"}')
 
     def test_kitchenSink(self):
         self.maxDiff = None
 
         """All settings set"""
         mail = Mail()
 
-        mail.set_from(Email("dx@sendgrid.com", "Elmer Thomas"))
+        mail.set_from(Email("test@example.com", "Example User"))
 
         mail.set_subject("Hello World from the SendGrid Python Library")
 
         personalization = Personalization()
-        personalization.add_to(Email("elmer.thomas@sendgrid.com", "Elmer Thomas"))
-        personalization.add_to(Email("elmer.thomas@gmail.com", "Elmer Thomas Alias"))
-        personalization.add_cc(Email("matt.bernier@sendgrid.com", "Matt Bernier"))
-        personalization.add_cc(Email("eric.shallock@sendgrid.com", "Eric Shallock"))
-        personalization.add_bcc(Email("matt.bernier+dx@sendgrid.com"))
-        personalization.add_bcc(Email("eric.shallock+dx@sendgrid.com"))
+        personalization.add_to(Email("test@example.com", "Example User"))
+        personalization.add_to(Email("test@example.com", "Example User"))
+        personalization.add_cc(Email("test@example.com", "Example User"))
+        personalization.add_cc(Email("test@example.com", "Example User"))
+        personalization.add_bcc(Email("test@example.com"))
+        personalization.add_bcc(Email("test@example.com"))
         personalization.set_subject("Hello World from the Personalized SendGrid Python Library")
         personalization.add_header(Header("X-Test", "test"))
         personalization.add_header(Header("X-Mock", "true"))
-        personalization.add_substitution(Substitution("%name%", "Tim"))
-        personalization.add_substitution(Substitution("%city%", "Riverside"))
+        personalization.add_substitution(Substitution("%name%", "Example User"))
+        personalization.add_substitution(Substitution("%city%", "Denver"))
         personalization.add_custom_arg(CustomArg("user_id", "343"))
         personalization.add_custom_arg(CustomArg("type", "marketing"))
         personalization.set_send_at(1443636843)
         mail.add_personalization(personalization)
 
         personalization2 = Personalization()
-        personalization2.add_to(Email("elmer.thomas@sendgrid.com", "Elmer Thomas"))
-        personalization2.add_to(Email("elmer.thomas@gmail.com", "Elmer Thomas Alias"))
-        personalization2.add_cc(Email("matt.bernier@sendgrid.com", "Matt Bernier"))
-        personalization2.add_cc(Email("eric.shallock@sendgrid.com", "Eric Shallock"))
-        personalization2.add_bcc(Email("matt.bernier+dx@sendgrid.com"))
-        personalization2.add_bcc(Email("eric.shallock+dx@sendgrid.com"))
+        personalization2.add_to(Email("test@example.com", "Example User"))
+        personalization2.add_to(Email("test@example.com", "Example User"))
+        personalization2.add_cc(Email("test@example.com", "Example User"))
+        personalization2.add_cc(Email("test@example.com", "Example User"))
+        personalization2.add_bcc(Email("test@example.com"))
+        personalization2.add_bcc(Email("test@example.com"))
         personalization2.set_subject("Hello World from the Personalized SendGrid Python Library")
         personalization2.add_header(Header("X-Test", "test"))
         personalization2.add_header(Header("X-Mock", "true"))
-        personalization2.add_substitution(Substitution("%name%", "Tim"))
-        personalization2.add_substitution(Substitution("%city%", "Riverside"))
+        personalization2.add_substitution(Substitution("%name%", "Example User"))
+        personalization2.add_substitution(Substitution("%city%", "Denver"))
         personalization2.add_custom_arg(CustomArg("user_id", "343"))
         personalization2.add_custom_arg(CustomArg("type", "marketing"))
         personalization2.set_send_at(1443636843)
@@ -115,7 +115,7 @@ def test_kitchenSink(self):
         mail.set_ip_pool_name("24")
 
         mail_settings = MailSettings()
-        mail_settings.set_bcc_settings(BCCSettings(True, Email("dx+reply@sendgrid.com")))
+        mail_settings.set_bcc_settings(BCCSettings(True, Email("test@example.com")))
         mail_settings.set_bypass_list_management(BypassListManagement(True))
         mail_settings.set_footer_settings(FooterSettings(True, "Footer Text", "<html><body>Footer Text</body></html>"))
         mail_settings.set_sandbox_mode(SandBoxMode(True))
@@ -129,6 +129,6 @@ def test_kitchenSink(self):
         tracking_settings.set_ganalytics(Ganalytics(True, "some source", "some medium", "some term", "some content", "some campaign"))
         mail.set_tracking_settings(tracking_settings)
 
-        mail.set_reply_to(Email("dx+reply@sendgrid.com"))
+        mail.set_reply_to(Email("test@example.com"))
 
-        self.assertEqual(json.dumps(mail.get(), sort_keys=True), '{"asm": {"group_id": 99, "groups_to_display": [4, 5, 6, 7, 8]}, "attachments": [{"content": "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3JhcyBwdW12", "content_id": "Balance Sheet", "disposition": "attachment", "filename": "balance_001.pdf", "type": "application/pdf"}, {"content": "BwdW", "content_id": "Banner", "disposition": "inline", "filename": "banner.png", "type": "image/png"}], "batch_id": "sendgrid_batch_id", "categories": ["May", "2016"], "content": [{"type": "text/plain", "value": "some text here"}, {"type": "text/html", "value": "<html><body>some text here</body></html>"}], "custom_args": {"campaign": "welcome", "weekday": "morning"}, "from": {"email": "dx@sendgrid.com", "name": "Elmer Thomas"}, "headers": {"X-Test1": "test1", "X-Test3": "test2"}, "ip_pool_name": "24", "mail_settings": {"bcc": {"email": "dx+reply@sendgrid.com", "enable": true}, "bypass_list_management": {"enable": true}, "footer": {"enable": true, "html": "<html><body>Footer Text</body></html>", "text": "Footer Text"}, "sandbox_mode": {"enable": true}, "spam_check": {"enable": true, "post_to_url": "https://spamcatcher.sendgrid.com", "threshold": 1}}, "personalizations": [{"bcc": [{"email": "matt.bernier+dx@sendgrid.com"}, {"email": "eric.shallock+dx@sendgrid.com"}], "cc": [{"email": "matt.bernier@sendgrid.com", "name": "Matt Bernier"}, {"email": "eric.shallock@sendgrid.com", "name": "Eric Shallock"}], "custom_args": {"type": "marketing", "user_id": "343"}, "headers": {"X-Mock": "true", "X-Test": "test"}, "send_at": 1443636843, "subject": "Hello World from the Personalized SendGrid Python Library", "substitutions": {"%city%": "Riverside", "%name%": "Tim"}, "to": [{"email": "elmer.thomas@sendgrid.com", "name": "Elmer Thomas"}, {"email": "elmer.thomas@gmail.com", "name": "Elmer Thomas Alias"}]}, {"bcc": [{"email": "matt.bernier+dx@sendgrid.com"}, {"email": "eric.shallock+dx@sendgrid.com"}], "cc": [{"email": "matt.bernier@sendgrid.com", "name": "Matt Bernier"}, {"email": "eric.shallock@sendgrid.com", "name": "Eric Shallock"}], "custom_args": {"type": "marketing", "user_id": "343"}, "headers": {"X-Mock": "true", "X-Test": "test"}, "send_at": 1443636843, "subject": "Hello World from the Personalized SendGrid Python Library", "substitutions": {"%city%": "Riverside", "%name%": "Tim"}, "to": [{"email": "elmer.thomas@sendgrid.com", "name": "Elmer Thomas"}, {"email": "elmer.thomas@gmail.com", "name": "Elmer Thomas Alias"}]}], "reply_to": {"email": "dx+reply@sendgrid.com"}, "sections": {"%section1%": "Substitution Text for Section 1", "%section2%": "Substitution Text for Section 2"}, "send_at": 1443636842, "subject": "Hello World from the SendGrid Python Library", "template_id": "13b8f94f-bcae-4ec6-b752-70d6cb59f932", "tracking_settings": {"click_tracking": {"enable": true, "enable_text": true}, "ganalytics": {"enable": true, "utm_campaign": "some campaign", "utm_content": "some content", "utm_medium": "some medium", "utm_source": "some source", "utm_term": "some term"}, "open_tracking": {"enable": true, "substitution_tag": "Optional tag to replace with the open image in the body of the message"}, "subscription_tracking": {"enable": true, "html": "<html><body>html to insert into the text/html portion of the message</body></html>", "substitution_tag": "Optional tag to replace with the open image in the body of the message", "text": "text to insert into the text/plain portion of the message"}}}')
+        self.assertEqual(json.dumps(mail.get(), sort_keys=True), '{"asm": {"group_id": 99, "groups_to_display": [4, 5, 6, 7, 8]}, "attachments": [{"content": "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3JhcyBwdW12", "content_id": "Balance Sheet", "disposition": "attachment", "filename": "balance_001.pdf", "type": "application/pdf"}, {"content": "BwdW", "content_id": "Banner", "disposition": "inline", "filename": "banner.png", "type": "image/png"}], "batch_id": "sendgrid_batch_id", "categories": ["May", "2016"], "content": [{"type": "text/plain", "value": "some text here"}, {"type": "text/html", "value": "<html><body>some text here</body></html>"}], "custom_args": {"campaign": "welcome", "weekday": "morning"}, "from": {"email": "test@example.com", "name": "Example User"}, "headers": {"X-Test1": "test1", "X-Test3": "test2"}, "ip_pool_name": "24", "mail_settings": {"bcc": {"email": "test@example.com", "enable": true}, "bypass_list_management": {"enable": true}, "footer": {"enable": true, "html": "<html><body>Footer Text</body></html>", "text": "Footer Text"}, "sandbox_mode": {"enable": true}, "spam_check": {"enable": true, "post_to_url": "https://spamcatcher.sendgrid.com", "threshold": 1}}, "personalizations": [{"bcc": [{"email": "test@example.com"}, {"email": "test@example.com"}], "cc": [{"email": "test@example.com", "name": "Example User"}, {"email": "test@example.com", "name": "Example User"}], "custom_args": {"type": "marketing", "user_id": "343"}, "headers": {"X-Mock": "true", "X-Test": "test"}, "send_at": 1443636843, "subject": "Hello World from the Personalized SendGrid Python Library", "substitutions": {"%city%": "Denver", "%name%": "Example User"}, "to": [{"email": "test@example.com", "name": "Example User"}, {"email": "test@example.com", "name": "Example User"}]}, {"bcc": [{"email": "test@example.com"}, {"email": "test@example.com"}], "cc": [{"email": "test@example.com", "name": "Example User"}, {"email": "test@example.com", "name": "Example User"}], "custom_args": {"type": "marketing", "user_id": "343"}, "headers": {"X-Mock": "true", "X-Test": "test"}, "send_at": 1443636843, "subject": "Hello World from the Personalized SendGrid Python Library", "substitutions": {"%city%": "Denver", "%name%": "Example User"}, "to": [{"email": "test@example.com", "name": "Example User"}, {"email": "test@example.com", "name": "Example User"}]}], "reply_to": {"email": "test@example.com"}, "sections": {"%section1%": "Substitution Text for Section 1", "%section2%": "Substitution Text for Section 2"}, "send_at": 1443636842, "subject": "Hello World from the SendGrid Python Library", "template_id": "13b8f94f-bcae-4ec6-b752-70d6cb59f932", "tracking_settings": {"click_tracking": {"enable": true, "enable_text": true}, "ganalytics": {"enable": true, "utm_campaign": "some campaign", "utm_content": "some content", "utm_medium": "some medium", "utm_source": "some source", "utm_term": "some term"}, "open_tracking": {"enable": true, "substitution_tag": "Optional tag to replace with the open image in the body of the message"}, "subscription_tracking": {"enable": true, "html": "<html><body>html to insert into the text/html portion of the message</body></html>", "substitution_tag": "Optional tag to replace with the open image in the body of the message", "text": "text to insert into the text/plain portion of the message"}}}')
