Use 'make_exception' from 'datastore.connection.Connection._request'.

tseaver · tseaver · commit 6f2796c4112b · 2015-01-28T18:04:31.000-05:00
Fixes #508.
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -14,9 +14,8 @@
 
 """Connections to gcloud datastore API servers."""
 
-import six
-
 from gcloud import connection
+from gcloud.exceptions import make_exception
 from gcloud.datastore import _datastore_v1_pb2 as datastore_pb
 from gcloud.datastore import helpers
 
@@ -54,7 +53,7 @@ def _request(self, dataset_id, method, data):
 
         :rtype: string
         :returns: The string response content from the API call.
-        :raises: :class:`six.moves.http_client.HTTPException` if the response
+        :raises: :class:`gcloud.exceptions.GCloudError` if the response
                  code is not 200 OK.
         """
         headers = {
@@ -68,9 +67,7 @@ def _request(self, dataset_id, method, data):
 
         status = headers['status']
         if status != '200':
-            message = ('Request failed with status code %s. '
-                       'Error was: %s' % (status, content))
-            raise six.moves.http_client.HTTPException(message)
+            raise make_exception(headers, content)
 
         return content
 
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
@@ -100,17 +100,16 @@ def test__request_w_200(self):
         self.assertEqual(http._called_with['body'], DATA)
 
     def test__request_not_200(self):
-        import six
+        from gcloud.exceptions import BadRequest
 
         DATASET_ID = 'DATASET'
         METHOD = 'METHOD'
         DATA = 'DATA'
         conn = self._makeOne()
-        conn._http = Http({'status': '400'}, 'Bad Request')
-        with self.assertRaises(six.moves.http_client.HTTPException) as e:
+        conn._http = Http({'status': '400'}, '{"message": "Bad Request"}')
+        with self.assertRaises(BadRequest) as e:
             conn._request(DATASET_ID, METHOD, DATA)
-        expected_message = ('Request failed with status code 400. '
-                            'Error was: Bad Request')
+        expected_message = ('400 Bad Request')
         self.assertEqual(str(e.exception), expected_message)
 
     def test__rpc(self):
@@ -845,12 +844,13 @@ class Http(object):
     _called_with = None
 
     def __init__(self, headers, content):
-        self._headers = headers
+        from httplib2 import Response
+        self._response = Response(headers)
         self._content = content
 
     def request(self, **kw):
         self._called_with = kw
-        return self._headers, self._content
+        return self._response, self._content
 
 
 class HttpMultiple(object):
