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

Use content_type kwarg instead of manipulating headers

Browse source
This commit is contained in:
Adam Byrtek 2015-03-29 23:05:40 +01:00 • committed by Markus Unterwaditzer
parent c4139e0e5d
commit 6c5ef2bc5c
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/testing.py
View file

@ -35,16 +35,14 @@ def make_test_environ_builder(app, path='/', base_url=None, json=None, *args, **
if url.query:
path += '?' + url.query
if json:
if json is not None:
if 'data' in kwargs:
raise RuntimeError('Client cannot provide both `json` and `data`')
kwargs['data'] = json_dumps(json)
# Only set Content-Type when not explicitly provided
if 'Content-Type' not in kwargs.get('headers', {}):
new_headers = kwargs.get('headers', {}).copy()
new_headers['Content-Type'] = 'application/json'
kwargs['headers'] = new_headers
if 'content_type' not in kwargs:
kwargs['content_type'] = 'application/json'
return EnvironBuilder(path, base_url, *args, **kwargs)