From 4f0dea74495fce4dffb1337a160cdff7822782b2 Mon Sep 17 00:00:00 2001 From: Bridget Date: Mon, 13 Apr 2020 16:00:17 +0200 Subject: [PATCH] Refactor --- lib.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib.py b/lib.py index b275f5b..d486823 100644 --- a/lib.py +++ b/lib.py @@ -19,15 +19,12 @@ def send_cmd(url: str, secret_key: str, cmd: str) -> Dict: try: response = requests.post(url, json=data, verify=False) response.raise_for_status() - response_data = response.json() except ( requests.ConnectionError, requests.exceptions.MissingSchema, requests.exceptions.InvalidURL, ): raise requests.exceptions.InvalidURL - except JSONDecodeError: - raise Exception("Error: Response has malformed json") except requests.exceptions.HTTPError as e: if e.response.status_code == 423: error_msg = e.response.json().get("error") @@ -35,6 +32,11 @@ def send_cmd(url: str, secret_key: str, cmd: str) -> Dict: else: raise e + try: + response_data = response.json() + except JSONDecodeError: + raise Exception("Error: Response has malformed json") + error = response_data.get("error", None) if error: raise ErrorReceived(f"Error: {error}")