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

Fix failing test: "AssertionError: 'application/javascript' != 'application/json'" in flask/testsuite/helpers.py", line 88

Browse source
This commit is contained in:
Marc Abramowitz 2012-05-27 18:02:54 -07:00
parent 086348e2f2
commit 447afc3525
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flask/helpers.py
View file

@ -133,13 +133,17 @@ def jsonify(*args, **kwargs):
"""
if __debug__:
_assert_have_json()
padded = kwargs.get('padded', False)
if 'padded' in kwargs:
if isinstance(kwargs['padded'], str):
callback = request.args.get(kwargs['padded']) or 'jsonp'
del kwargs['padded']
if padded:
if isinstance(padded, str):
callback = request.args.get(padded) or 'jsonp'
else:
callback = request.args.get('callback') or \
request.args.get('jsonp') or 'jsonp'
del kwargs['padded']
json_str = json.dumps(dict(*args, **kwargs), indent=None)
content = str(callback) + "(" + json_str + ")"
return current_app.response_class(content, mimetype='application/javascript')