Decoding to string when binary_type is supplied to gcloud.exceptions.make_exception

craigloftus · craigloftus · commit e7ffadc7b20a · 2015-03-12T11:03:16.000Z
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
@@ -152,7 +152,7 @@ def test__request_not_200(self):
         METHOD = 'METHOD'
         DATA = 'DATA'
         conn = self._makeOne()
-        conn._http = Http({'status': '400'}, 'Entity value is indexed.')
+        conn._http = Http({'status': '400'}, b'Entity value is indexed.')
         with self.assertRaises(BadRequest) as e:
             conn._request(DATASET_ID, METHOD, DATA)
         expected_message = '400 Entity value is indexed.'
diff --git a/gcloud/exceptions.py b/gcloud/exceptions.py
@@ -176,8 +176,9 @@ def make_exception(response, content, use_json=True):
     errors = ()
 
     if isinstance(content, six.binary_type):
+        message = content.decode('utf-8')
         if use_json:
-            payload = json.loads(content.decode('utf-8'))
+            payload = json.loads(message)
         else:
             payload = {}
     else:
diff --git a/gcloud/test_exceptions.py b/gcloud/test_exceptions.py
@@ -55,7 +55,7 @@ def _callFUT(self, response, content):
     def test_hit_w_content_as_str(self):
         from gcloud.exceptions import NotFound
         response = _Response(404)
-        content = '{"message": "Not Found"}'
+        content = b'{"message": "Not Found"}'
         exception = self._callFUT(response, content)
         self.assertTrue(isinstance(exception, NotFound))
         self.assertEqual(exception.message, 'Not Found')
