Changing datastore Connection to only accept client.

dhermes · dhermes · commit a32a022e8a28 · 2017-01-26T15:53:28.000-08:00
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
@@ -36,7 +36,7 @@ class Connection(object):
     """A generic connection to Google Cloud Platform.
 
     :type client: :class:`~google.cloud.client.Client`
-    :param client: The client that owns the credentials.
+    :param client: The client that owns the current connection.
     """
 
     USER_AGENT = DEFAULT_USER_AGENT
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
@@ -109,7 +109,7 @@ class Client(_ClientFactoryMixin):
                  ``credentials`` for the current object.
     """
 
-    _SCOPE = None
+    SCOPE = None
     """The scopes required for authenticating with a service.
 
     Needs to be set by subclasses.
@@ -123,7 +123,7 @@ def __init__(self, credentials=None, http=None):
         if credentials is None and http is None:
             credentials = get_credentials()
         self._credentials = google.auth.credentials.with_scopes_if_required(
-            credentials, self._SCOPE)
+            credentials, self.SCOPE)
         self._http_internal = http
 
     @property
diff --git a/datastore/google/cloud/datastore/_http.py b/datastore/google/cloud/datastore/_http.py
@@ -397,11 +397,8 @@ class Connection(connection_module.Connection):
     in method arguments, however it should be capable of returning advanced
     types.
 
-    :type credentials: :class:`oauth2client.client.OAuth2Credentials`
-    :param credentials: The OAuth2 Credentials to use for this connection.
-
-    :type http: :class:`httplib2.Http` or class that defines ``request()``.
-    :param http: An optional HTTP object to make requests.
+    :type client: :class:`~google.cloud.datastore.client.Client`
+    :param client: The client that owns the current connection.
     """
 
     API_BASE_URL = 'https://' + DATASTORE_API_HOST
@@ -414,11 +411,8 @@ class Connection(connection_module.Connection):
                         '/{project}:{method}')
     """A template for the URL of a particular API call."""
 
-    SCOPE = ('https://www.googleapis.com/auth/datastore',)
-    """The scopes required for authenticating as a Cloud Datastore consumer."""
-
-    def __init__(self, credentials=None, http=None):
-        super(Connection, self).__init__(credentials=credentials, http=http)
+    def __init__(self, client):
+        super(Connection, self).__init__(client)
         try:
             self.host = os.environ[GCD_HOST]
             self.api_base_url = 'http://' + self.host
diff --git a/datastore/google/cloud/datastore/client.py b/datastore/google/cloud/datastore/client.py
@@ -18,8 +18,7 @@
 from google.cloud._helpers import _LocalStack
 from google.cloud._helpers import (
     _determine_default_project as _base_default_project)
-from google.cloud.client import _ClientProjectMixin
-from google.cloud.client import Client as _BaseClient
+from google.cloud.client import ClientWithProject
 from google.cloud.datastore._http import Connection
 from google.cloud.datastore import helpers
 from google.cloud.datastore.batch import Batch
@@ -143,7 +142,7 @@ def _extended_lookup(connection, project, key_pbs,
     return results
 
 
-class Client(_BaseClient, _ClientProjectMixin):
+class Client(ClientWithProject):
     """Convenience wrapper for invoking APIs/factories w/ a project.
 
     .. doctest::
@@ -171,13 +170,14 @@ class Client(_BaseClient, _ClientProjectMixin):
                  ``credentials`` for the current object.
     """
 
+    SCOPE = ('https://www.googleapis.com/auth/datastore',)
+    """The scopes required for authenticating as a Cloud Datastore consumer."""
+
     def __init__(self, project=None, namespace=None,
                  credentials=None, http=None):
-        _ClientProjectMixin.__init__(self, project=project)
-        _BaseClient.__init__(self, credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
-
+        super(Client, self).__init__(
+            project=project, credentials=credentials, http=http)
+        self._connection = Connection(self)
         self.namespace = namespace
         self._batch_stack = _LocalStack()
 
diff --git a/datastore/unit_tests/test__http.py b/datastore/unit_tests/test__http.py
diff --git a/datastore/unit_tests/test_client.py b/datastore/unit_tests/test_client.py
