Merge pull request #335 from mehronkugler/fix/334_unicode_values_in_substitution_helper

thinkingserious · web-flow · commit fae1edbc0a2b · 2017-08-31T13:41:32.000-07:00
Permit unicode string values with Substitution helper
diff --git a/sendgrid/helpers/mail/mail.py b/sendgrid/helpers/mail/mail.py
@@ -384,15 +384,15 @@ def key(self):
 
     @key.setter
     def key(self, value):
-        self._key = str(value)
+        self._key = value
 
     @property
     def value(self):
         return self._value
 
     @value.setter
     def value(self, value):
-        self._value = str(value)
+        self._value = value
 
     def get(self):
         substitution = {}
diff --git a/test/test_mail.py b/test/test_mail.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 
 from sendgrid.helpers.mail import (
@@ -408,3 +409,61 @@ def test_kitchenSink(self):
             json.dumps(mail.get(), sort_keys=True),
             json.dumps(expected_result, sort_keys=True)
         )
+
+    def test_unicode_values_in_substitutions_helper(self):
+
+        """ Test that the Substitutions helper accepts unicode values """
+
+        self.maxDiff = None
+
+        """Minimum required to send an email"""
+        mail = Mail()
+
+        mail.from_email = Email("test@example.com")
+
+        mail.subject = "Testing unicode substitutions with the SendGrid Python Library"
+
+        personalization = Personalization()
+        personalization.add_to(Email("test@example.com"))
+        personalization.add_substitution(Substitution("%city%", u"Αθήνα"))
+        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>"))
+
+        expected_result = {
+            "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": [
+                {
+                    "substitutions": {
+                        "%city%": u"Αθήνα"
+                    },
+                    "to": [
+                        {
+                            "email": "test@example.com"
+                        }
+                    ]
+                }
+            ],
+            "subject": "Testing unicode substitutions with the SendGrid Python Library",
+        }
+
+        self.assertEqual(
+            json.dumps(mail.get(), sort_keys=True),
+            json.dumps(expected_result, sort_keys=True)
+        )
