Skip to content

fixed wrong "message" handling in AsyncAPIError #90

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
shiyuechengineer merged 2 commits into from
May 4, 2020
Merged

fixed wrong "message" handling in AsyncAPIError #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3bb09f
fixed wrong handling of AsyncAPIError message
coreGreenberet May 1, 2020
02df0c5
added newline
coreGreenberet May 1, 2020
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
10 changes: 4 additions & 6 deletions meraki_v0/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ def __init__(self, metadata, response, message):
self.response = response
self.tag = metadata['tags'][0]
self.operation = metadata['operation']
self.status = self.response.status if self.response is not None and self.response.status else None
self.reason = self.response.reason if self.response is not None and self.response.reason else None
try:
self.message = self.response.json() if self.response is not None and self.response.json() else None
except ValueError:
self.message = self.response.text[:100]
self.status = response.status if response is not None and response.status else None
self.reason = response.reason if response is not None and response.reason else None
self.message = message

super().__init__(
f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}'
)
Expand Down
10 changes: 4 additions & 6 deletions meraki_v1/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ def __init__(self, metadata, response, message):
self.response = response
self.tag = metadata['tags'][0]
self.operation = metadata['operation']
self.status = self.response.status if self.response is not None and self.response.status else None
self.reason = self.response.reason if self.response is not None and self.response.reason else None
try:
self.message = self.response.json() if self.response is not None and self.response.json() else None
except ValueError:
self.message = self.response.text[:100]
self.status = response.status if response is not None and response.status else None
self.reason = response.reason if response is not None and response.reason else None
self.message = message

super().__init__(
f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}'
)
Expand Down