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

Use proper exception type and update changelog

Browse source
This commit is contained in:
Adam Byrtek 2015-04-01 00:11:52 +01:00 • committed by Markus Unterwaditzer
parent 6c5ef2bc5c
commit b099999c6c
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -9,6 +9,7 @@ Development Lead
Patches and Suggestions Patches and Suggestions
``````````````````````` ```````````````````````
- Adam Byrtek
- Adam Zapletal - Adam Zapletal
- Ali Afshar - Ali Afshar
- Chris Edgemon - Chris Edgemon

3
CHANGES
View file

@ -11,6 +11,9 @@ Version 0.12
See pull request ``#1849``. See pull request ``#1849``.
- Make ``flask.safe_join`` able to join multiple paths like ``os.path.join`` - Make ``flask.safe_join`` able to join multiple paths like ``os.path.join``
(pull request ``#1730``). (pull request ``#1730``).
- Added `json` keyword argument to :meth:`flask.testing.FlaskClient.open`
(and related ``get``, ``post``, etc.), which makes it more convenient to
send JSON requests from the test client.
Version 0.11.2 Version 0.11.2
-------------- --------------

2
flask/testing.py
View file

@ -37,7 +37,7 @@ def make_test_environ_builder(app, path='/', base_url=None, json=None, *args, **
if json is not None: if json is not None:
if 'data' in kwargs: if 'data' in kwargs:
raise RuntimeError('Client cannot provide both `json` and `data`') raise ValueError('Client cannot provide both `json` and `data`')
kwargs['data'] = json_dumps(json) kwargs['data'] = json_dumps(json)
# Only set Content-Type when not explicitly provided # Only set Content-Type when not explicitly provided