From c3bb09f7105e2382498a112567233679a05f8656 Mon Sep 17 00:00:00 2001 From: coreGreenberet Date: Fri, 1 May 2020 10:11:38 +0200 Subject: [PATCH 1/2] fixed wrong handling of AsyncAPIError message --- meraki_v0/exceptions.py | 12 +++++------- meraki_v1/exceptions.py | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/meraki_v0/exceptions.py b/meraki_v0/exceptions.py index ca9e804a..3ef8b96c 100644 --- a/meraki_v0/exceptions.py +++ b/meraki_v0/exceptions.py @@ -31,15 +31,13 @@ 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}' ) def __repr__(self): - return f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}' + return f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}' \ No newline at end of file diff --git a/meraki_v1/exceptions.py b/meraki_v1/exceptions.py index ca9e804a..421f9633 100644 --- a/meraki_v1/exceptions.py +++ b/meraki_v1/exceptions.py @@ -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}' ) From 02df0c555c2d0392ee58a8b67bbcc55363344155 Mon Sep 17 00:00:00 2001 From: coreGreenberet Date: Fri, 1 May 2020 10:26:23 +0200 Subject: [PATCH 2/2] added newline --- meraki_v0/exceptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meraki_v0/exceptions.py b/meraki_v0/exceptions.py index 3ef8b96c..421f9633 100644 --- a/meraki_v0/exceptions.py +++ b/meraki_v0/exceptions.py @@ -40,4 +40,4 @@ def __init__(self, metadata, response, message): ) def __repr__(self): - return f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}' \ No newline at end of file + return f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}'