Resource manager: use google.api.core.page_iterator

resource_manager/google/cloud/resource_manager/client.py

@@ -15,8 +15,8 @@
 """A Client for interacting with the Resource Manager API."""
 
 
+from google.api.core import page_iterator
 from google.cloud.client import Client as BaseClient
-from google.cloud.iterator import HTTPIterator
 
 from google.cloud.resource_manager._http import Connection
 from google.cloud.resource_manager.project import Project
@@ -164,9 +164,13 @@ def list_projects(self, filter_params=None, page_size=None):
         if filter_params is not None:
             extra_params['filter'] = filter_params
 
-        return HTTPIterator(
-            client=self, path='/projects', item_to_value=_item_to_project,
-            items_key='projects', extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path='/projects',
+            item_to_value=_item_to_project,
+            items_key='projects',
+            extra_params=extra_params)
 
 
 def _item_to_project(iterator, resource):

resource_manager/tests/unit/test_client.py

@@ -88,15 +88,15 @@ def test_fetch_project(self):
         self.assertEqual(project.labels, labels)
 
     def test_list_projects_return_type(self):
-        from google.cloud.iterator import HTTPIterator
+        from google.api.core import page_iterator
 
         credentials = _make_credentials()
         client = self._make_one(credentials=credentials)
         # Patch the connection with one we can easily control.
         client._connection = _Connection({})
 
         results = client.list_projects()
-        self.assertIsInstance(results, HTTPIterator)
+        self.assertIsInstance(results, page_iterator.HTTPIterator)
 
     def test_list_projects_no_paging(self):
         credentials = _make_credentials()
@@ -227,12 +227,12 @@ def test_list_projects_with_filter(self):
         })
 
     def test_page_empty_response(self):
-        from google.cloud.iterator import Page
+        from google.api.core import page_iterator
 
         credentials = _make_credentials()
         client = self._make_one(credentials=credentials)
         iterator = client.list_projects()
-        page = Page(iterator, (), None)
+        page = page_iterator.Page(iterator, (), None)
         iterator._page = page
         self.assertEqual(page.num_items, 0)
         self.assertEqual(page.remaining, 0)