Merge branch '3'

Kevin Burke · Kevin Burke · commit 7e6cf5435ad3 · 2013-05-21T09:27:16.000-07:00
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -20,8 +20,9 @@ def setUp(self):
     def test_request(self, mock):
         self.client.request("2010-04-01", method="GET")
         mock.assert_called_with("GET", "https://api.twilio.com/2010-04-01",
-            headers={"User-Agent": 'twilio-python'}, params={},
-            auth=AUTH, data=None)
+                                headers={"User-Agent": 'twilio-python',
+                                         'Accept-Charset': 'utf-8'},
+                                params={}, auth=AUTH, data=None)
 
     def test_connect_apps(self):
         self.assertIsInstance(self.client.connect_apps,
diff --git a/tests/test_make_request.py b/tests/test_make_request.py
@@ -11,6 +11,7 @@
 
 get_headers = {
     "User-Agent": "twilio-python/%s" % (twilio.__version__),
+    "Accept-Charset": "utf-8",
     "Accept": "application/json",
     }
 
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -77,6 +77,7 @@ def request(self, path, method=None, vars=None):
 
         headers = {
             "User-Agent": "twilio-python",
+            "Accept-Charset": "utf-8",
         }
 
         resp = make_request(method, uri, auth=self.auth, data=data,
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -58,7 +58,7 @@ def make_request(method, url, params=None, data=None, headers=None,
     resp, content = http.request(url, method, headers=headers, body=data)
 
     # Format httplib2 request as requests object
-    return Response(resp, content, url)
+    return Response(resp, content.decode('utf-8'), url)
 
 
 def make_twilio_request(method, uri, **kwargs):
@@ -67,6 +67,7 @@ def make_twilio_request(method, uri, **kwargs):
     """
     headers = kwargs.get("headers", {})
     headers["User-Agent"] = "twilio-python/%s" % twilio.__version__
+    headers["Accept-Charset"] = "utf-8"
 
     if method == "POST" and "Content-Type" not in headers:
         headers["Content-Type"] = "application/x-www-form-urlencoded"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`get_headers = {`
`13`	`13`	`"User-Agent": "twilio-python/%s" % (twilio.__version__),`
	`14`	`+ "Accept-Charset": "utf-8",`
`14`	`15`	`"Accept": "application/json",`
`15`	`16`	`}`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ def request(self, path, method=None, vars=None):`
`77`	`77`
`78`	`78`	`headers = {`
`79`	`79`	`"User-Agent": "twilio-python",`
	`80`	`+ "Accept-Charset": "utf-8",`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`resp = make_request(method, uri, auth=self.auth, data=data,`