Merge pull request #487 from tseaver/439-split_query_iterator

Fix #439: split query vs. iterator apart.
googleapis · Jan 6, 2015 · 9142051 · 9142051
2 parents b79d862 + 2516ff8
commit 9142051
Show file tree

Hide file tree

Showing 7 changed files with 903 additions and 1,004 deletions.
diff --git a/gcloud/datastore/dataset.py b/gcloud/datastore/dataset.py
@@ -16,7 +16,6 @@
 
 from gcloud.datastore import helpers
 from gcloud.datastore.entity import Entity
-from gcloud.datastore.query import Query
 from gcloud.datastore.transaction import Transaction
 
 
@@ -75,19 +74,6 @@ def id(self):
 
         return self._id
 
-    def query(self, *args, **kwargs):
-        """Create a query bound to this dataset.
-
-        :param args: positional arguments, passed through to the Query
-
-        :param kw: keyword arguments, passed through to the Query
-
-        :rtype: :class:`gcloud.datastore.query.Query`
-        :returns: a new Query instance, bound to this dataset.
-        """
-        kwargs['dataset'] = self
-        return Query(*args, **kwargs)
-
     def entity(self, kind, exclude_from_indexes=()):
         """Create an entity bound to this dataset.