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

Merge branch 'master' into sprint-branch

Browse source
This commit is contained in:
Armin Ronacher 2013-05-23 14:01:33 +01:00
commit 16df96c552
6 changed files with 17 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flask/json.py
View file

@ -17,7 +17,10 @@ from werkzeug.http import http_date
# Use the same json implementation as itsdangerous on which we
# depend anyways.
from itsdangerous import json as _json
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