Skip to content

Create a generic iterator wrapping 'list_*' methods of client-side objects #1699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 2 commits into from
Apr 5, 2016
Merged

Create a generic iterator wrapping 'list_*' methods of client-side objects #1699

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91951c
Create a generic iterator wrapping 'list_*' methods of client-side ob…
tseaver Apr 4, 2016
88e3869
s/_page_no/_page_num/g.
tseaver Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
s/_page_no/_page_num/g. 
Addresses:
#1699 (comment).
  • Loading branch information
@tseaver
tseaver committed Apr 4, 2016
commit 88e38695c37008c75fdf2bc91b81668f9325f640
6 changes: 3 additions & 3 deletions gcloud/iterator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,15 @@ def __init__(self, method, page_token=None, page_size=None,
self._page_size = page_size
self._kw = kw
self._max_calls = max_calls
self._page_no = 0
self._page_num = 0

def __iter__(self):
while self._max_calls is None or self._page_no < self._max_calls:
while self._max_calls is None or self._page_num < self._max_calls:
items, new_token = self._method(
page_token=self._token, page_size=self._page_size, **self._kw)
for item in items:
yield item
if new_token is None:
return
self._page_no += 1
self._page_num += 1
self._token = new_token
4 changes: 2 additions & 2 deletions gcloud/test_iterator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def test_ctor_defaults(self):
self.assertEqual(iterator._page_size, None)
self.assertEqual(iterator._kw, {})
self.assertEqual(iterator._max_calls, None)
self.assertEqual(iterator._page_no, 0)
self.assertEqual(iterator._page_num, 0)

def test_ctor_explicit(self):
wlm = _WithListMethod()
Expand All @@ -203,7 +203,7 @@ def test_ctor_explicit(self):
self.assertEqual(iterator._page_size, SIZE)
self.assertEqual(iterator._kw, {'foo_type': 'Bar'})
self.assertEqual(iterator._max_calls, CALLS)
self.assertEqual(iterator._page_no, 0)
self.assertEqual(iterator._page_num, 0)

def test___iter___defaults(self):
import string
Expand Down