diff --git a/AUTHORS b/AUTHORS index e20a3735..c2415977 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,4 +24,5 @@ Patches and Suggestions - Sebastien Estienne - Simon Sapin - Stephane Wirtel +- Thomas Schranz - Zhao Xiaohong diff --git a/flask/helpers.py b/flask/helpers.py index 560492c6..420bfab8 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -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