From 4138b8b47b3266b136efbd868ae1ab38570a2a6f Mon Sep 17 00:00:00 2001 From: Jordan Cook Date: Sat, 11 Jun 2022 22:02:28 -0500 Subject: Use json.JSONDecodeError and requests.RequestException instead of requests.JSONDecodeError for compatibility with requests<2.27 --- requests_cache/serializers/cattrs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'requests_cache') 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 -- cgit v1.2.1