Renaming datastore AltIterator-->Iterator.

Author: dhermes

datastore/google/cloud/datastore/query.py

@@ -358,20 +358,20 @@ def fetch(self, limit=None, offset=0, start_cursor=None, end_cursor=None,
         :param client: client used to connect to datastore.
                        If not supplied, uses the query's value.
 
-        :rtype: :class:`AltIterator`
+        :rtype: :class:`Iterator`
         :returns: The iterator for the query.
         :raises: ValueError if ``connection`` is not passed and no implicit
                  default has been set.
         """
         if client is None:
             client = self._client
 
-        return AltIterator(
+        return Iterator(
             self, client, limit=limit, offset=offset,
             start_cursor=start_cursor, end_cursor=end_cursor)
 
 
-class AltIterator(BaseIterator):
+class Iterator(BaseIterator):
     """Represent the state of a given execution of a Query.
 
     :type query: :class:`~google.cloud.datastore.query.Query`
@@ -399,7 +399,7 @@ class AltIterator(BaseIterator):
 
     def __init__(self, query, client, limit=None, offset=None,
                  start_cursor=None, end_cursor=None):
-        super(AltIterator, self).__init__(
+        super(Iterator, self).__init__(
             client=client, item_to_value=_item_to_entity,
             page_token=start_cursor, max_results=limit)
         self._query = query

datastore/unit_tests/test_query.py

@@ -309,39 +309,39 @@ def test_distinct_on_multiple_calls(self):
         self.assertEqual(query.distinct_on, _DISTINCT_ON2)
 
     def test_fetch_defaults_w_client_attr(self):
-        from google.cloud.datastore.query import AltIterator
+        from google.cloud.datastore.query import Iterator
 
         connection = _Connection()
         client = self._makeClient(connection)
         query = self._makeOne(client)
         iterator = query.fetch()
 
-        self.assertIsInstance(iterator, AltIterator)
+        self.assertIsInstance(iterator, Iterator)
         self.assertIs(iterator._query, query)
         self.assertIs(iterator.client, client)
         self.assertIsNone(iterator.max_results)
         self.assertEqual(iterator._offset, 0)
 
     def test_fetch_w_explicit_client(self):
-        from google.cloud.datastore.query import AltIterator
+        from google.cloud.datastore.query import Iterator
 
         connection = _Connection()
         client = self._makeClient(connection)
         other_client = self._makeClient(connection)
         query = self._makeOne(client)
         iterator = query.fetch(limit=7, offset=8, client=other_client)
-        self.assertIsInstance(iterator, AltIterator)
+        self.assertIsInstance(iterator, Iterator)
         self.assertIs(iterator._query, query)
         self.assertIs(iterator.client, other_client)
         self.assertEqual(iterator.max_results, 7)
         self.assertEqual(iterator._offset, 8)
 
 
-class TestAltIterator(unittest.TestCase):
+class TestIterator(unittest.TestCase):
 
     def _getTargetClass(self):
-        from google.cloud.datastore.query import AltIterator
-        return AltIterator
+        from google.cloud.datastore.query import Iterator
+        return Iterator
 
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)