Skip to content

Commit 0e9f946

Browse files
author
Shiyue Cheng
authored
Merge pull request meraki#75 from coreGreenberet/aio_exception_problem_73
Aio exception problem 73
2 parents 709f748 + 472da53 commit 0e9f946

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
22
# No PyCharm config files
33
.idea/
4-
venv/
4+
venv/
5+
__pycache__

meraki/aio/rest_session.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ async def request(self, metadata, method, url, **kwargs):
8989
return None
9090
else:
9191
response = None
92+
message = None
9293
for _ in range(retries):
9394
# Make the HTTP request to the API endpoint
9495
try:
@@ -154,7 +155,7 @@ async def request(self, metadata, method, url, **kwargs):
154155
self._logger.error(
155156
f"{tag}, {operation} - {status} {reason}, {message}"
156157
)
157-
raise AsyncAPIError(metadata, response, await response.text())
158+
raise AsyncAPIError(metadata, response, message)
158159

159160
async def get(self, metadata, url, params=None):
160161
metadata["method"] = "GET"

meraki/exceptions.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ def __init__(self, metadata, response, message):
3131
self.response = response
3232
self.tag = metadata['tags'][0]
3333
self.operation = metadata['operation']
34-
self.status = self.response.status if self.response is not None and self.response.status else None
35-
self.reason = self.response.reason if self.response is not None and self.response.reason else None
36-
try:
37-
self.message = self.response.json() if self.response is not None and self.response.json() else None
38-
except ValueError:
39-
self.message = self.response.text[:100]
34+
self.status = response.status if response is not None and response.status else None
35+
self.reason = response.reason if response is not None and response.reason else None
36+
self.message = message
37+
4038
super().__init__(
4139
f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}'
4240
)

0 commit comments

Comments
 (0)