Skip to content

Fix #522 (needed bc of PEP 479) #540

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
merged 2 commits into from
Jul 16, 2021
Merged

Fix #522 (needed bc of PEP 479) #540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a54c15
PEP 479: Change StopIteration handling inside generators
fogti Jan 26, 2021
61c1ba9
PEP 479: add appropriate __future__ tag
fogti Jan 26, 2021
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
7 changes: 4 additions & 3 deletions twython/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
dealing with the Twitter API
"""

from __future__ import generator_stop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if this import is actually needed.

import warnings
import re

Expand Down Expand Up @@ -501,7 +502,7 @@ def cursor(self, function, return_pages=False, **params):
content = function(**params)

if not content:
raise StopIteration
return

if hasattr(function, 'iter_key'):
results = content.get(function.iter_key)
Expand All @@ -516,7 +517,7 @@ def cursor(self, function, return_pages=False, **params):

if function.iter_mode == 'cursor' and \
content['next_cursor_str'] == '0':
raise StopIteration
return

try:
if function.iter_mode == 'id':
Expand All @@ -529,7 +530,7 @@ def cursor(self, function, return_pages=False, **params):
params = dict(parse_qsl(next_results.query))
else:
# No more results
raise StopIteration
return
else:
# Twitter gives tweets in reverse chronological order:
params['max_id'] = str(int(content[-1]['id_str']) - 1)
Expand Down