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
This commit is contained in:
Jacob McSwain 2023-03-29 13:16:50 -05:00
parent 762698957c
commit c91f9bd751
No known key found for this signature in database
GPG key ID: 73CD69A753AD039E

View file

@ -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}])")