Allow both unicode strings and encoded byte strings in request data

kyleconroy · kyleconroy · commit 6027292ec54b · 2011-12-16T17:17:02.000-08:00
diff --git a/twilio/rest/resources.py b/twilio/rest/resources.py
@@ -128,7 +128,10 @@ def make_request(method, url,
     if data is not None:
         udata = {}
         for k, v in data.iteritems():
-            udata[k.encode('utf-8')] = v.encode('utf-8')
+            try:
+                udata[k.encode('utf-8')] = unicode(v).encode('utf-8')
+            except UnicodeDecodeError:
+                udata[k.encode('utf-8')] = unicode(v, 'utf-8').encode('utf-8')
         data = urlencode(udata)
 
     if params is not None:
