Skip to content

- Fixes a KeyError exception when paginating through the API endpoints whose response payloads are JSON objects. (Fixes #270) #287

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 1 commit into from
Apr 8, 2025
Merged

- Fixes a KeyError exception when paginating through the API endpoints whose response payloads are JSON objects. (Fixes #270) #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 0 deletions meraki/aio/rest_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ async def _get_pages_iterator(
# just prepare the list
if type(results) == list:
return_items = results
elif type(results) == dict and "items" in results:
return_items = results["items"]
# For event log endpoint
elif type(results) == dict:
if direction == "next":
Expand Down Expand Up @@ -467,6 +469,11 @@ async def _get_pages_legacy(
# Append that page's results, depending on the endpoint
if type(results) == list:
results.extend(await response.json(content_type = None))
elif isinstance(results, dict) and "items" in results:
json_response = await response.json(content_type=None)
results.extend(json_response["items"])
if "meta" in results:
results["meta"]["counts"]["items"]["remaining"] = json_response["meta"]["counts"]["items"]["remaining"]
# For event log endpoint
elif type(results) == dict:
json_response = await response.json(content_type = None)
Expand Down
6 changes: 6 additions & 0 deletions meraki/rest_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ def _get_pages_iterator(
# just prepare the list
if type(results) == list:
return_items = results
elif type(results) == dict and "items" in results:
return_items = results["items"]
# For event log endpoint
elif type(results) == dict:
if direction == "next":
Expand Down Expand Up @@ -448,6 +450,10 @@ def _get_pages_legacy(self, metadata, url, params=None, total_pages=-1, directio
# Append that page's results, depending on the endpoint
if isinstance(results, list):
results.extend(response.json())
elif isinstance(results, dict) and "items" in results:
results["items"].extend(response.json()["items"])
if "meta" in results:
results["meta"]["counts"]["items"]["remaining"] = response.json()["meta"]["counts"]["items"]["remaining"]
# For event log endpoint
elif isinstance(results, dict):
try:
Expand Down
Loading