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

Removed second mention of json. This fixes #290

Browse source
This commit is contained in:
Armin Ronacher 2011-08-09 16:16:04 +02:00
parent 92c7bdd2dd
commit 63876614b6
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/api.rst
View file

@ -119,12 +119,6 @@ Incoming Request Data
Libraries that do that are prototype, jQuery and Mochikit and Libraries that do that are prototype, jQuery and Mochikit and
probably some more. probably some more.
.. attribute:: json
Contains the parsed body of the JSON request if the mimetype of
the incoming data was `application/json`. This requires Python 2.6
or an installed version of simplejson.
.. class:: request .. class:: request
To access incoming request data, you can use the global `request` To access incoming request data, you can use the global `request`

4
flask/wrappers.py
View file

@ -91,7 +91,9 @@ class Request(RequestBase):
@cached_property @cached_property
def json(self): def json(self):
"""If the mimetype is `application/json` this will contain the """If the mimetype is `application/json` this will contain the
parsed JSON data. parsed JSON data. Otherwise this will be `None`.
This requires Python 2.6 or an installed version of simplejson.
""" """
if __debug__: if __debug__:
_assert_have_json() _assert_have_json()