Start removing httplib2 usage from datastore

Author: Jon Wayne Parrott

bigquery/google/cloud/bigquery/table.py

@@ -14,10 +14,10 @@
 
 """Define API Datasets."""
 
+import collections
 import datetime
 import os
 
-import httplib2
 import six
 
 import google.auth.transport.requests
@@ -50,6 +50,8 @@
     '{:d} bytes remaining.')
 _DEFAULT_NUM_RETRIES = 6
 
+_FakeResponse = collections.namedtuple('_FakeResponse', ['status'])
+
 
 class Table(object):
     """Tables represent a set of rows whose values correspond to a schema.
@@ -1314,6 +1316,6 @@ def _raise_from_invalid_response(error, error_info=None):
              to the failed status code
     """
     response = error.response
-    faux_response = httplib2.Response({'status': response.status_code})
+    faux_response = _FakeResponse(status=response.status_code)
     raise make_exception(faux_response, response.content,
                          error_info=error_info, use_json=False)

bigquery/tests/system.py

@@ -87,7 +87,9 @@ def setUp(self):
 
     def tearDown(self):
         from google.cloud.bigquery.dataset import Dataset
-        from google.cloud.storage import Bucket
+        #from google.cloud.storage import Bucket
+        # TODO: FIX
+        Bucket = None
         from google.cloud.exceptions import BadRequest
         from google.cloud.exceptions import Conflict
 

datastore/google/cloud/datastore/_http.py

@@ -68,16 +68,17 @@ def _request(http, project, method, data, base_url):
         connection_module.CLIENT_INFO_HEADER: _CLIENT_INFO,
     }
     api_url = build_api_url(project, method, base_url)
-    headers, content = http.request(
-        uri=api_url, method='POST', headers=headers, body=data)
+    response = http.request(
+        url=api_url, method='POST', headers=headers, data=data)
 
-    status = headers['status']
-    if status != '200':
-        error_status = status_pb2.Status.FromString(content)
+    if response.status_code != 200:
+        error_status = status_pb2.Status.FromString(response.content)
+        # TODO: Fix
+        raise exceptions.GoogleCloudError(error_status.message)
         raise exceptions.make_exception(
             headers, error_status.message, use_json=False)
 
-    return content
+    return response.content
 
 
 def _rpc(http, project, method, base_url, request_pb, response_pb_cls):