Implement Iterator.pages and simplify items iteration #2594
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11a4f48 to
0ff8ece
Compare
NOTE: There is a current mismatch between incrementing Iterator.num_results in Iterator.__iter__ vs. incrementing it in Iterator.pages (there it won't be incremented, so this will need to be addressed in a subsequent commit).
Also moving __iter__ functionality into a helper so that the "started?" check could be done **before** entering the generator. This is because the "self.pages" generator wouldn't be entered until an item was consumed off the items iterator.
0ff8ece to
9a504c6
Compare
tseaver
approved these changes
Oct 25, 2016
theacodes
approved these changes
Oct 25, 2016
|
|
||
| :rtype: :class:`Iterator` | ||
| :returns: Current instance. | ||
| :rtype: :class:`~types.GeneratorType` |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
dhermes
added a commit
to dhermes/google-cloud-python
that referenced
this pull request
Oct 25, 2016
Broken by simultaneous merges of googleapis#2594 and googleapis#2485.
richkadel
pushed a commit
to richkadel/google-cloud-python
that referenced
this pull request
May 6, 2017
Implement Iterator.pages and simplify items iteration
richkadel
pushed a commit
to richkadel/google-cloud-python
that referenced
this pull request
May 6, 2017
Broken by simultaneous merges of googleapis#2594 and googleapis#2485.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2548. As mentioned in #2529, this came from trying to design for the case that a page of responses came from GAX instead of from an HTTP response.
I have left alone
Iterator.next_page_tokenandIterator.page_numberfor now but think the token should be moved to thePageand the page number should just be removed (people can just useenumerate(iterator.pages)if they want the page number).NOTE: Has #2592 as diffbase.