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

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2010-07-12 18:05:16 +02:00
commit a532568680
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flask/helpers.py
View file

@ -26,7 +26,12 @@ except ImportError:
try:
import json
except ImportError:
json_available = False
try:
# Google Appengine offers simplejson via django
from django.utils import simplejson as json
except ImportError:
json_available = False
from werkzeug import Headers, wrap_file, is_resource_modified, cached_property
from werkzeug.exceptions import NotFound