summaryrefslogtreecommitdiff
path: root/requests_cache
diff options
context:
space:
mode:
authorJordan Cook <jordan.cook@pioneer.com>2022-06-11 22:02:28 -0500
committerJordan Cook <jordan.cook@pioneer.com>2022-06-11 22:10:08 -0500
commit4138b8b47b3266b136efbd868ae1ab38570a2a6f (patch)
tree65aa141ee72b0478024af3dab23dd9d98e7eb327 /requests_cache
parent3b7849df68884a2e0add040c2ac1ae7503f69368 (diff)
downloadrequests-cache-4138b8b47b3266b136efbd868ae1ab38570a2a6f.tar.gz
Use json.JSONDecodeError and requests.RequestException instead of requests.JSONDecodeError for compatibility with requests<2.27
Diffstat (limited to 'requests_cache')
-rw-r--r--requests_cache/serializers/cattrs.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/requests_cache/serializers/cattrs.py b/requests_cache/serializers/cattrs.py
index e9eb991..d5c3dda 100644
--- a/requests_cache/serializers/cattrs.py
+++ b/requests_cache/serializers/cattrs.py
@@ -13,11 +13,12 @@ serialization formats.
"""
from datetime import datetime, timedelta
from decimal import Decimal
+from json import JSONDecodeError
from typing import Callable, Dict, ForwardRef, MutableMapping
from cattr import GenConverter
from requests.cookies import RequestsCookieJar, cookiejar_from_dict
-from requests.exceptions import JSONDecodeError
+from requests.exceptions import RequestException
from requests.structures import CaseInsensitiveDict
from ..models import CachedResponse, DecodedContent
@@ -136,7 +137,7 @@ def _decode_content(response: CachedResponse, response_dict: Dict) -> Dict:
try:
response_dict['_decoded_content'] = response.json()
response_dict.pop('_content', None)
- except JSONDecodeError:
+ except (JSONDecodeError, RequestException):
pass
# Decode body as text