Switching to using response.text

ilanbiala · ilanbiala · commit 04491e6decad · 2017-06-21T11:41:43.000-07:00
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -18,9 +18,10 @@ def setUp(self):
 
 
 class MockResponse(Response):
-    def __init__(self, status, content):
-        # Here we will convert content (a string type) to a bytes object in
+    def __init__(self, status, text):
+        # Here we will convert text (a string type) to a bytes object in
         # Python 3 for consistency purposes
-        if (six.PY3):
-            content = bytes(content, 'utf-8')
-        super(MockResponse, self).__init__(status, content)
+        # if (six.PY3):
+            # text = bytes(content, 'utf-8')
+        self.text = text
+        super(MockResponse, self).__init__(status, text)
diff --git a/tests/unit/http/test_validation_client.py b/tests/unit/http/test_validation_client.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import unittest
 
 import mock
@@ -77,7 +79,7 @@ def setUp(self):
         self.request_mock = Mock()
 
         self.session_mock.prepare_request.return_value = self.request_mock
-        self.session_mock.send.return_value = MockResponse(200, 'test, omega: \u03a9, pile of poop: \u1f4a9')
+        self.session_mock.send.return_value = MockResponse(200, 'test, omega: Ω, pile of poop: 💩')
         self.validation_token.return_value.to_jwt.return_value = 'test-token'
         self.request_mock.headers = {}
 
@@ -116,4 +118,4 @@ def test_request_with_unicode_response(self):
         self.assertEqual('other.twilio.com', self.request_mock.headers['Host'])
         self.assertEqual('test-token', self.request_mock.headers['Twilio-Client-Validation'])
         self.assertEqual(200, response.status_code)
-        self.assertEqual('test, omega: \u03a9, pile of poop: \u1f4a9', response.content)
+        self.assertEqual('test, omega: Ω, pile of poop: 💩', response.content)
diff --git a/twilio/base/page.py b/twilio/base/page.py
@@ -1,6 +1,5 @@
 import json
 
-from twilio.compat import string_compat
 from twilio.base.exceptions import TwilioException
 
 
@@ -59,7 +58,7 @@ def process_response(self, response):
         if response.status_code != 200:
             raise TwilioException('Unable to fetch page', response)
 
-        return json.loads(string_compat(response.content))
+        return json.loads(response.text)
 
     def load_page(self, payload):
         """
diff --git a/twilio/base/version.py b/twilio/base/version.py
@@ -1,7 +1,6 @@
 import json
 from math import ceil
 
-from twilio.compat import string_compat
 from twilio.base import values
 from twilio.base.exceptions import TwilioRestException
 
@@ -82,7 +81,7 @@ def fetch(self, method, uri, params=None, data=None, headers=None, auth=None, ti
         if response.status_code < 200 or response.status_code >= 300:
             raise self.exception(method, uri, response, 'Unable to fetch record')
 
-        return json.loads(string_compat(response.content))
+        return json.loads(response.text)
 
     def update(self, method, uri, params=None, data=None, headers=None, auth=None, timeout=None,
                allow_redirects=False):
@@ -103,7 +102,7 @@ def update(self, method, uri, params=None, data=None, headers=None, auth=None, t
         if response.status_code < 200 or response.status_code >= 300:
             raise self.exception(method, uri, response, 'Unable to update record')
 
-        return json.loads(string_compat(response.content))
+        return json.loads(response.text)
 
     def delete(self, method, uri, params=None, data=None, headers=None, auth=None, timeout=None,
                allow_redirects=False):
@@ -209,4 +208,4 @@ def create(self, method, uri, params=None, data=None, headers=None, auth=None, t
         if response.status_code < 200 or response.status_code >= 300:
             raise self.exception(method, uri, response, 'Unable to create record')
 
-        return json.loads(string_compat(response.content))
+        return json.loads(response.text)
diff --git a/twilio/http/response.py b/twilio/http/response.py
@@ -2,8 +2,8 @@ class Response(object):
     """
 
     """
-    def __init__(self, status_code, content):
-        self.content = content
+    def __init__(self, status_code, text):
+        self.content = text
         self.cached = False
         self.status_code = status_code
         self.ok = self.status_code < 400
diff --git a/twilio/http/validation_client.py b/twilio/http/validation_client.py
@@ -69,7 +69,7 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
             timeout=timeout,
         )
 
-        return Response(int(response.status_code), string_compat(response.content))
+        return Response(int(response.status_code), response.text)
 
     def _build_validation_payload(self, request):
         """

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,`
`69`	`69`	`timeout=timeout,`
`70`	`70`	`)`
`71`	`71`
`72`		`- return Response(int(response.status_code), string_compat(response.content))`
	`72`	`+ return Response(int(response.status_code), response.text)`
`73`	`73`
`74`	`74`	`def _build_validation_payload(self, request):`
`75`	`75`	`"""`