orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get_json separate cache depending on silent arg

Browse source
This commit is contained in:
fphonor 2018-03-19 23:41:54 +08:00 • committed by David Lord
parent 8c0d8c1c14
commit 171eb28c95
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flask/wrappers.py
View file

@ -23,7 +23,7 @@ class JSONMixin(object):
.. versionadded:: 1.0
"""
_cached_json = Ellipsis
_cached_json = (Ellipsis, Ellipsis)
@property
def is_json(self):
@ -60,8 +60,8 @@ class JSONMixin(object):
:param silent: Silence parsing errors and return ``None`` instead.
:param cache: Store the parsed JSON to return for subsequent calls.
"""
if cache and self._cached_json is not Ellipsis:
return self._cached_json
if cache and self._cached_json[silent] is not Ellipsis:
return self._cached_json[silent]
if not (force or self.is_json):
return None
@ -77,11 +77,17 @@ class JSONMixin(object):
except ValueError as e:
if silent:
rv = None
if cache:
normal_rv, _ = self._cached_json
self._cached_json = (normal_rv, rv)
else:
rv = self.on_json_loading_failed(e)
if cache:
self._cached_json = rv
if cache:
_, silent_rv = self._cached_json
self._cached_json = (rv, silent_rv)
else:
if cache:
self._cached_json = (rv, rv)
return rv