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

Support old and new name for json

Browse source
This commit is contained in:
Armin Ronacher 2013-05-23 13:46:51 +01:00
parent aecc41deb8
commit eb023bcfad
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flask/json.py
View file

@ -15,8 +15,11 @@ from .globals import current_app, request
from werkzeug.http import http_date
# Use the same json implementation as itsdangerous on which we
# depend anyways.
from itsdangerous import simplejson as _json
# depend anyways. This name changed at one point so support both.
try:
from itsdangerous import simplejson as _json
except ImportError:
from itsdangerous import json as _json
# figure out if simplejson escapes slashes. This behavior was changed