From e19e12244e0ea09a95ce638ece39b98c8e46cee9 Mon Sep 17 00:00:00 2001 From: ittus Date: Wed, 12 Oct 2016 03:06:52 +0800 Subject: [PATCH 1/2] Substitutions allow non-strings for values --- sendgrid/helpers/mail/mail.py | 8 ++++---- test/test_mail.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sendgrid/helpers/mail/mail.py b/sendgrid/helpers/mail/mail.py index 48d25f161..efeefb8e2 100644 --- a/sendgrid/helpers/mail/mail.py +++ b/sendgrid/helpers/mail/mail.py @@ -215,14 +215,14 @@ def get(self): class Substitution(object): def __init__(self, key=None, value=None): - self.key = key if key != None else None - self.value = value if value != None else None + self.key = str(key) if key != None else None + self.value = str(value) if value != None else None def set_key(self, key): - self.key = key + self.key = str(key) if key != None else None def set_value(self, value): - self.value = value + self.value = str(value) if value != None else None def get(self): substitution = {} diff --git a/test/test_mail.py b/test/test_mail.py index e0dc945ba..5f683432b 100644 --- a/test/test_mail.py +++ b/test/test_mail.py @@ -51,6 +51,7 @@ def test_kitchenSink(self): personalization.add_header(Header("X-Mock", "true")) personalization.add_substitution(Substitution("%name%", "Example User")) personalization.add_substitution(Substitution("%city%", "Denver")) + personalization.add_substitution(Substitution("%year%", 2017)) personalization.add_custom_arg(CustomArg("user_id", "343")) personalization.add_custom_arg(CustomArg("type", "marketing")) personalization.set_send_at(1443636843) From 8f48faa67c8be138807df056a576408587946da9 Mon Sep 17 00:00:00 2001 From: ittus Date: Wed, 12 Oct 2016 03:24:30 +0800 Subject: [PATCH 2/2] remove uncessary unit test --- test/test_mail.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_mail.py b/test/test_mail.py index 5f683432b..e0dc945ba 100644 --- a/test/test_mail.py +++ b/test/test_mail.py @@ -51,7 +51,6 @@ def test_kitchenSink(self): personalization.add_header(Header("X-Mock", "true")) personalization.add_substitution(Substitution("%name%", "Example User")) personalization.add_substitution(Substitution("%city%", "Denver")) - personalization.add_substitution(Substitution("%year%", 2017)) personalization.add_custom_arg(CustomArg("user_id", "343")) personalization.add_custom_arg(CustomArg("type", "marketing")) personalization.set_send_at(1443636843)