Merge pull request #946 from tseaver/944-datastore_client_from_dataset

Rename 'dataset.Dataset' -> 'client.Client'.

docs/datastore-dataset.rst → docs/datastore-client.rst

@@ -1,7 +1,7 @@
 Dataset
 ~~~~~~~
 
-.. automodule:: gcloud.datastore.dataset
+.. automodule:: gcloud.datastore.client
   :members:
   :undoc-members:
   :show-inheritance:

docs/index.rst

@@ -3,13 +3,13 @@
   :hidden:
 
   gcloud-api
+  datastore-client
   datastore-api
   datastore-entities
   datastore-keys
   datastore-queries
   datastore-transactions
   datastore-batches
-  datastore-dataset
   storage-api
   storage-blobs
   storage-buckets

gcloud/datastore/__init__.py

@@ -28,9 +28,10 @@
   which represents a connection between your machine and the Cloud Datastore
   API.
 
-- :class:`gcloud.datastore.dataset.Dataset`
-  which represents a dataset ID (string) bundled with a connection and has
-  convenience methods for constructing objects with that dataset ID.
+- :class:`gcloud.datastore.client.Client`
+  which represents a dataset ID (string) and namespace (string) bundled with
+  a connection and has convenience methods for constructing objects with that
+  dataset ID / namespace.
 
 - :class:`gcloud.datastore.entity.Entity`
   which represents a single entity in the datastore
@@ -63,7 +64,7 @@
 from gcloud.datastore.batch import Batch
 from gcloud.datastore.connection import SCOPE
 from gcloud.datastore.connection import Connection
-from gcloud.datastore.dataset import Dataset
+from gcloud.datastore.client import Client
 from gcloud.datastore.entity import Entity
 from gcloud.datastore.key import Key
 from gcloud.datastore.query import Query

gcloud/datastore/dataset.py → gcloud/datastore/client.py

@@ -25,7 +25,7 @@
 from gcloud.datastore.transaction import Transaction
 
 
-class Dataset(object):
+class Client(object):
     """Convenience wrapper for invoking APIs/factories w/ a dataset ID.
 
     :type dataset_id: string