Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle a single unusual argument in jsonify #1209

Closed
wants to merge 4 commits into from
Closed

Handle a single unusual argument in jsonify #1209

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97a7d8f
Handle a single unusual argument in jsonify
nickretallack Oct 20, 2014
4021a08
more idiomatic
nickretallack Oct 20, 2014
c75c33a
Opt-In JSON security
nickretallack Oct 20, 2014
3a68178
ThiefMaster's comments
nickretallack Oct 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion flask/json.py
View file
Open in desktop
Expand Up @@ -234,7 +234,13 @@ def get_current_user():
if current_app.config['JSONIFY_PRETTYPRINT_REGULAR'] \
and not request.is_xhr:
indent = 2
return current_app.response_class(dumps(dict(*args, **kwargs),

if len(args) == 1 and len(kwargs) == 0:

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

data = args[0]
else:
data = dict(*args, **kwargs)

return current_app.response_class(dumps(data,
indent=indent),
mimetype='application/json')

Expand Down