Convert 'Dataset.query' to use only **kwargs.

tseaver · tseaver · commit 3d2699e66242 · 2015-02-18T11:46:51.000-05:00
Per: https://github.com/GoogleCloudPlatform/gcloud-python/pull/660/files#r24897521
diff --git a/gcloud/datastore/dataset.py b/gcloud/datastore/dataset.py
@@ -87,17 +87,12 @@ def transaction(self):
         return Transaction(dataset_id=self.dataset_id,
                            connection=self.connection)
 
-    def query(self,
-              kind=None,
-              namespace=None,
-              ancestor=None,
-              filters=(),
-              projection=(),
-              order=(),
-              group_by=()):
+    def query(self, **kwargs):
         """Proxy to :func:`gcloud.datastore.query.Query`.
 
         Passes our ``dataset_id``.
         """
-        return Query(self.dataset_id, kind, namespace, ancestor, filters,
-                     projection, order, group_by)
+        if 'dataset_id' in kwargs:
+            raise TypeError('Cannot pass dataset_id')
+        kwargs['dataset_id'] = self.dataset_id
+        return Query(**kwargs)
diff --git a/gcloud/datastore/test_dataset.py b/gcloud/datastore/test_dataset.py
@@ -232,6 +232,12 @@ def test_transaction_w_connection(self):
         self.assertEqual(xact.kwargs,
                          {'dataset_id': self.DATASET_ID, 'connection': conn})
 
+    def test_query_w_dataset_id(self):
+        KIND = 'KIND'
+        dataset = self._makeOne()
+        self.assertRaises(TypeError,
+                          dataset.query, kind=KIND, dataset_id=self.DATASET_ID)
+
     def test_query_w_defaults(self):
         from gcloud.datastore import dataset as MUT
         from gcloud._testing import _Monkey
@@ -241,9 +247,8 @@ def test_query_w_defaults(self):
             query = dataset.query()
 
         self.assertTrue(isinstance(query, _Dummy))
-        args = (self.DATASET_ID, None, None, None, (), (), (), ())
-        self.assertEqual(query.args, args)
-        self.assertEqual(query.kwargs, {})
+        self.assertEqual(query.args, ())
+        self.assertEqual(query.kwargs, {'dataset_id': self.DATASET_ID})
 
     def test_query_explicit(self):
         from gcloud.datastore import dataset as MUT
@@ -258,14 +263,29 @@ def test_query_explicit(self):
         dataset = self._makeOne()
 
         with _Monkey(MUT, Query=_Dummy):
-            query = dataset.query(KIND, NAMESPACE, ANCESTOR, FILTERS,
-                                  PROJECTION, ORDER, GROUP_BY)
+            query = dataset.query(
+                kind=KIND,
+                namespace=NAMESPACE,
+                ancestor=ANCESTOR,
+                filters=FILTERS,
+                projection=PROJECTION,
+                order=ORDER,
+                group_by=GROUP_BY,
+                )
 
         self.assertTrue(isinstance(query, _Dummy))
-        args = (self.DATASET_ID, KIND, NAMESPACE, ANCESTOR, FILTERS,
-                PROJECTION, ORDER, GROUP_BY)
-        self.assertEqual(query.args, args)
-        self.assertEqual(query.kwargs, {})
+        kwargs = {
+            'dataset_id': self.DATASET_ID,
+            'kind': KIND,
+            'namespace': NAMESPACE,
+            'ancestor': ANCESTOR,
+            'filters': FILTERS,
+            'projection': PROJECTION,
+            'order': ORDER,
+            'group_by': GROUP_BY,
+        }
+        self.assertEqual(query.args, ())
+        self.assertEqual(query.kwargs, kwargs)
 
 
 class _Dummy(object):
