MC6
diff --git a/‎tests/test_unicode.py
Lines changed: 50 additions & 0 deletions b/‎tests/test_unicode.py
Lines changed: 50 additions & 0 deletions
diff --git a/‎twilio/rest/resources.py
Lines changed: 5 additions & 2 deletions b/‎twilio/rest/resources.py
Lines changed: 5 additions & 2 deletions
@@ -2,6 +2,56 @@
 from mock import patch, Mock
 from twilio.rest import resources
 
+@patch("httplib2.Http")
+@patch("twilio.rest.resources.Response")
+def test_ascii_encode(resp_mock, mock):
+    http = mock.return_value
+    http.request.return_value = (Mock(), Mock())
+
+    data = {
+        "body": "HeyHey".encode('utf-8')
+        }
+    
+    resources.make_request("GET", "http://www.example.com", data=data)
+
+    http.request.assert_called_with("http://www.example.com", "GET", 
+            headers=None, body="body=HeyHey")
+
+
+@patch("httplib2.Http")
+@patch("twilio.rest.resources.Response")
+def test_ascii(resp_mock, mock):
+    http = mock.return_value
+    http.request.return_value = (Mock(), Mock())
+
+    data = {
+        "body": "HeyHey" 
+        }
+    
+    resources.make_request("GET", "http://www.example.com", data=data)
+
+    http.request.assert_called_with("http://www.example.com", "GET", 
+            headers=None, body="body=HeyHey")
+
+
+@patch("httplib2.Http")
+@patch("twilio.rest.resources.Response")
+def test_double_encoding(resp_mock, mock):
+    http = mock.return_value
+    http.request.return_value = (Mock(), Mock())
+
+    body = u"Chloéñ"
+
+    data = {
+        "body": body.encode('utf-8'),
+        }
+    
+    resources.make_request("GET", "http://www.example.com", data=data)
+
+    http.request.assert_called_with("http://www.example.com", "GET", 
+            headers=None, body="body=Chlo%C3%A9%C3%B1")
+
+
 @patch("httplib2.Http")
 @patch("twilio.rest.resources.Response")
 def test_paging(resp_mock, mock):
 
@@ -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')] = unicode(v).encode('utf-8')
+            try:
+                udata[k.encode('utf-8')] = unicode(v).encode('utf-8')
+            except UnicodeDecodeError:
+                udata[k.encode('utf-8')] = v
         data = urlencode(udata)
 
     if params is not None:
@@ -806,7 +809,7 @@ def transfer(self, account_sid):
 
     def update(self, **kwargs):
         """
-        Update this phone number instance
+        Update this phone number instance. 
         """
         a = self.parent.update(self.name, **kwargs)
         self.load(a.__dict__)