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

document python 2.6 minimum requirement, remove all stuff that refers to 2.5

Browse source
This commit is contained in:
Thomas Waldmann 2013-05-18 17:06:25 +02:00
parent 521398d5e7
commit 40fad2ece8
10 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flask/json.py
View file

@ -161,8 +161,7 @@ def jsonify(*args, **kwargs):
"id": 42
}
This requires Python 2.6 or an installed version of simplejson. For
security reasons only objects are supported toplevel. For more
For security reasons only objects are supported toplevel. For more
information about this, have a look at :ref:`json-security`.
.. versionadded:: 0.2

2
flask/wrappers.py
View file

@ -92,8 +92,6 @@ class Request(RequestBase):
def json(self):
"""If the mimetype is `application/json` this will contain the
parsed JSON data. Otherwise this will be `None`.
This requires Python 2.6 or an installed version of simplejson.
"""
if self.mimetype == 'application/json':
request_charset = self.mimetype_params.get('charset')