Making datastore client inherit from base class.

This required lots of changes since the tests assume
a client only optionally has a connection attached.

gcloud/datastore/client.py

@@ -13,19 +13,21 @@
 # limitations under the License.
 """Convenience wrapper for invoking APIs/factories w/ a dataset ID."""
 
+from gcloud.client import Client as BaseClient
 from gcloud.datastore.api import delete
 from gcloud.datastore.api import delete_multi
 from gcloud.datastore.api import get
 from gcloud.datastore.api import get_multi
 from gcloud.datastore.api import put
 from gcloud.datastore.api import put_multi
 from gcloud.datastore.batch import Batch
+from gcloud.datastore.connection import Connection
 from gcloud.datastore.key import Key
 from gcloud.datastore.query import Query
 from gcloud.datastore.transaction import Transaction
 
 
-class Client(object):
+class Client(BaseClient):
     """Convenience wrapper for invoking APIs/factories w/ a dataset ID.
 
     :type dataset_id: string
@@ -34,16 +36,26 @@ class Client(object):
     :type namespace: string
     :param namespace: (optional) namespace to pass to proxied API methods.
 
-    :type connection: :class:`gcloud.datastore.connection.Connection`, or None
-    :param connection: (optional) connection to pass to proxied API methods
+    :type credentials: :class:`oauth2client.client.OAuth2Credentials` or
+                       :class:`NoneType`
+    :param credentials: The OAuth2 Credentials to use for the connection
+                        owned by this client. If not passed (and if no ``http``
+                        object is passed), falls back to the default inferred
+                        from the environment.
+
+    :type http: :class:`httplib2.Http` or class that defines ``request()``.
+    :param http: An optional HTTP object to make requests. If not passed, an
+                 ``http`` object is created that is bound to the
+                 ``credentials`` for the current object.
     """
 
-    def __init__(self, dataset_id, namespace=None, connection=None):
-        if dataset_id is None:
-            raise ValueError('dataset_id required')
+    _connection_class = Connection
+
+    def __init__(self, dataset_id, namespace=None,
+                 credentials=None, http=None):
         self.dataset_id = dataset_id
         self.namespace = namespace
-        self.connection = connection
+        super(Client, self).__init__(credentials=credentials, http=http)
 
     def get(self, key, missing=None, deferred=None):
         """Proxy to :func:`gcloud.datastore.api.get`.