From c91f9bd7512c863f6550b4efd97023a1c8cac05d Mon Sep 17 00:00:00 2001 From: Jacob McSwain Date: Wed, 29 Mar 2023 13:16:50 -0500 Subject: [PATCH] Fix wrapped JSON Decode error from requests Also squashes the following: [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- modules/webhooks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/webhooks.py b/modules/webhooks.py index cc16e6e..de06cc1 100755 --- a/modules/webhooks.py +++ b/modules/webhooks.py @@ -1,5 +1,7 @@ from json import JSONDecodeError +from requests.exceptions import JSONDecodeError as requestsJSONDecodeError + from modules import util from modules.util import Failed @@ -70,7 +72,7 @@ class Webhooks: response.status_code >= 400 or ("result" in response_json and response_json["result"] == "error") ) and skip is False: raise Failed(f"({response.status_code} [{response.reason}]) {response_json}") - except JSONDecodeError: + except (JSONDecodeError, requestsJSONDecodeError): if response.status_code >= 400: raise Failed(f"({response.status_code} [{response.reason}])")