Just do the encode

scottsexton · scottsexton · commit 8647e15db69a · 2013-12-17T12:33:25.000-06:00
diff --git a/sendgrid/transport/web.py b/sendgrid/transport/web.py
@@ -85,11 +85,9 @@ def send(self, message):
 
         for key in optional_params:
             if optional_params[key]:
-                val = optional_params[key]
-                if isinstance(val, unicode):
-                    data[key] = val.encode('utf-8')
-                elif isinstance(val, str):
-                    data[key] = val.decode('utf-8')
+                data[key] = optional_params[key]
+                if isinstance(data[key], unicode):
+                    data[key] = data[key].encode('utf-8')
 
         data = urllib.urlencode(data, 1)
         req = urllib2.Request(url, data)
