root
/
flask
mirror of https://github.com/pallets/flask.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Armin Ronacher 2010-07-12 18:05:16 +02:00
parent d12d73263f f3b6d94bf7
commit a532568680
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -24,4 +24,5 @@ Patches and Suggestions
- Sebastien Estienne - Sebastien Estienne
- Simon Sapin - Simon Sapin
- Stephane Wirtel - Stephane Wirtel
- Thomas Schranz
- Zhao Xiaohong - Zhao Xiaohong

7
flask/helpers.py
View File

@ -26,7 +26,12 @@ except ImportError:
try: try:
import json import json
except ImportError: 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 import Headers, wrap_file, is_resource_modified, cached_property
from werkzeug.exceptions import NotFound from werkzeug.exceptions import NotFound