maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Remove redundant cache flag

Browse source
This commit is contained in:
Adam Byrtek 2015-04-02 01:13:48 +01:00 • committed by Markus Unterwaditzer
parent c9ef500c5c
commit 23de58682c
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/testing.rst
View file

@ -353,3 +353,11 @@ independently of the session backend used::
Note that in this case you have to use the ``sess`` object instead of the Note that in this case you have to use the ``sess`` object instead of the
:data:`flask.session` proxy. The object however itself will provide the :data:`flask.session` proxy. The object however itself will provide the
same interface. same interface.
Testing JSON APIs
-----------------
.. versionadded:: 1.0
Flask has comprehensive

6
flask/wrappers.py
View file

@ -18,10 +18,10 @@ from .globals import _request_ctx_stack
_missing = object() _missing = object()
def _get_data(req, cache): def _get_data(req):
getter = getattr(req, 'get_data', None) getter = getattr(req, 'get_data', None)
if getter is not None: if getter is not None:
return getter(cache=cache) return getter()
return req.data return req.data
@ -84,7 +84,7 @@ class JSONMixin(object):
# been encoded correctly as well. # been encoded correctly as well.
charset = self.mimetype_params.get('charset') charset = self.mimetype_params.get('charset')
try: try:
data = _get_data(self, cache) data = _get_data(self)
if charset is not None: if charset is not None:
rv = json.loads(data, encoding=charset) rv = json.loads(data, encoding=charset)
else: else: