Skip to content

Commit fef829e

Browse files
author
Jon Wayne Parrott
authored
Move google.cloud.iterator to google.api.core.page_iterator (#3770)
* Move google.cloud.iterator to google.api.core.page_iterator * Re-write tests to pytest style. * Make GAXIterator private- it will soon be removed. * Pass api_request into HTTPIterator to avoid accessing private members * BigQuery: use google.api.core.page_iterator * DNS: use google.api.core.page_iterator * Logging: use google.api.core.page_iterator * PubSub: use google.api.core.page_iterator * Resource manager: use google.api.core.page_iterator * Runtimeconfig: use google.api.core.page_iterator * logging: use google.api.core._GAXIterator * Storage: use google.api.core.page_iterator * Pubsub: use google.api.core._GAXIterator * Trace: use google.api.core._GAXIterator * Spanner: use google.api.core._GAXIterator
1 parent e5e9d7a commit fef829e

2 files changed

Lines changed: 30 additions & 19 deletions

File tree

‎packages/google-cloud-dns/google/cloud/dns/client.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414

1515
"""Client for interacting with the Google Cloud DNS API."""
1616

17-
17+
from google.api.core import page_iterator
1818
from google.cloud.client import ClientWithProject
1919

2020
from google.cloud.dns._http import Connection
2121
from google.cloud.dns.zone import ManagedZone
22-
from google.cloud.iterator import HTTPIterator
2322

2423

2524
class Client(ClientWithProject):
@@ -86,14 +85,18 @@ def list_zones(self, max_results=None, page_token=None):
8685
not passed, the API will return the first page of
8786
zones.
8887
89-
:rtype: :class:`~google.cloud.iterator.Iterator`
88+
:rtype: :class:`~google.api.core.page_iterator.Iterator`
9089
:returns: Iterator of :class:`~google.cloud.dns.zone.ManagedZone`
9190
belonging to this project.
9291
"""
9392
path = '/projects/%s/managedZones' % (self.project,)
94-
return HTTPIterator(
95-
client=self, path=path, item_to_value=_item_to_zone,
96-
items_key='managedZones', page_token=page_token,
93+
return page_iterator.HTTPIterator(
94+
client=self,
95+
api_request=self._connection.api_request,
96+
path=path,
97+
item_to_value=_item_to_zone,
98+
items_key='managedZones',
99+
page_token=page_token,
97100
max_results=max_results)
98101

99102
def zone(self, name, dns_name=None, description=None):
@@ -122,7 +125,7 @@ def zone(self, name, dns_name=None, description=None):
122125
def _item_to_zone(iterator, resource):
123126
"""Convert a JSON managed zone to the native object.
124127
125-
:type iterator: :class:`~google.cloud.iterator.Iterator`
128+
:type iterator: :class:`~google.api.core.page_iterator.Iterator`
126129
:param iterator: The iterator that has retrieved the item.
127130
128131
:type resource: dict

‎packages/google-cloud-dns/google/cloud/dns/zone.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import six
1818

19+
from google.api.core import page_iterator
1920
from google.cloud._helpers import _rfc3339_to_datetime
2021
from google.cloud.exceptions import NotFound
2122
from google.cloud.dns.changes import Changes
2223
from google.cloud.dns.resource_record_set import ResourceRecordSet
23-
from google.cloud.iterator import HTTPIterator
2424

2525

2626
class ManagedZone(object):
@@ -340,17 +340,21 @@ def list_resource_record_sets(self, max_results=None, page_token=None,
340340
(Optional) the client to use. If not passed, falls back to the
341341
``client`` stored on the current zone.
342342
343-
:rtype: :class:`~google.cloud.iterator.Iterator`
343+
:rtype: :class:`~google.api.core.page_iterator.Iterator`
344344
:returns: Iterator of :class:`~.resource_record_set.ResourceRecordSet`
345345
belonging to this zone.
346346
"""
347347
client = self._require_client(client)
348348
path = '/projects/%s/managedZones/%s/rrsets' % (
349349
self.project, self.name)
350-
iterator = HTTPIterator(
351-
client=client, path=path,
352-
item_to_value=_item_to_resource_record_set, items_key='rrsets',
353-
page_token=page_token, max_results=max_results)
350+
iterator = page_iterator.HTTPIterator(
351+
client=client,
352+
api_request=client._connection.api_request,
353+
path=path,
354+
item_to_value=_item_to_resource_record_set,
355+
items_key='rrsets',
356+
page_token=page_token,
357+
max_results=max_results)
354358
iterator.zone = self
355359
return iterator
356360

@@ -374,16 +378,20 @@ def list_changes(self, max_results=None, page_token=None, client=None):
374378
(Optional) the client to use. If not passed, falls back to the
375379
``client`` stored on the current zone.
376380
377-
:rtype: :class:`~google.cloud.iterator.Iterator`
381+
:rtype: :class:`~google.api.core.page_iterator.Iterator`
378382
:returns: Iterator of :class:`~.changes.Changes`
379383
belonging to this zone.
380384
"""
381385
client = self._require_client(client)
382386
path = '/projects/%s/managedZones/%s/changes' % (
383387
self.project, self.name)
384-
iterator = HTTPIterator(
385-
client=client, path=path, item_to_value=_item_to_changes,
386-
items_key='changes', page_token=page_token,
388+
iterator = page_iterator.HTTPIterator(
389+
client=client,
390+
api_request=client._connection.api_request,
391+
path=path,
392+
item_to_value=_item_to_changes,
393+
items_key='changes',
394+
page_token=page_token,
387395
max_results=max_results)
388396
iterator.zone = self
389397
return iterator
@@ -392,7 +400,7 @@ def list_changes(self, max_results=None, page_token=None, client=None):
392400
def _item_to_resource_record_set(iterator, resource):
393401
"""Convert a JSON resource record set value to the native object.
394402
395-
:type iterator: :class:`~google.cloud.iterator.Iterator`
403+
:type iterator: :class:`~google.api.core.page_iterator.Iterator`
396404
:param iterator: The iterator that has retrieved the item.
397405
398406
:type resource: dict
@@ -407,7 +415,7 @@ def _item_to_resource_record_set(iterator, resource):
407415
def _item_to_changes(iterator, resource):
408416
"""Convert a JSON "changes" value to the native object.
409417
410-
:type iterator: :class:`~google.cloud.iterator.Iterator`
418+
:type iterator: :class:`~google.api.core.page_iterator.Iterator`
411419
:param iterator: The iterator that has retrieved the item.
412420
413421
:type resource: dict

0 commit comments

Comments
 (0)