Adding explicit check for binary_type in gcloud.storage.connection.api_request

Author: craigloftus

gcloud/storage/connection.py

@@ -16,6 +16,7 @@
 
 import json
 
+import six
 from six.moves.urllib.parse import urlencode  # pylint: disable=F0401
 
 from gcloud import connection as base_connection
@@ -231,6 +232,9 @@ def api_request(self, method, path, query_params=None,
         if not 200 <= response.status < 300:
             raise make_exception(response, content)
 
+        if not isinstance(content, six.binary_type):
+            raise TypeError('Expected binary type, got %s' % type(content))
+
         if content and expect_json:
             content_type = response.get('content-type', '')
             if not content_type.startswith('application/json'):

gcloud/storage/test_connection.py

@@ -281,6 +281,15 @@ def test_api_request_w_500(self):
         )
         self.assertRaises(InternalServerError, conn.api_request, 'GET', '/')
 
+    def test_api_request_non_binary_response(self):
+        PROJECT = 'project'
+        conn = self._makeOne(PROJECT)
+        conn._http = Http(
+            {'status': '200', 'content-type': 'application/json'},
+            u'CONTENT',
+        )
+        self.assertRaises(TypeError, conn.api_request, 'GET', '/')
+
 
 class Http(object):