Browse Source

Support old and new name for json

pull/741/head
Armin Ronacher 12 years ago
parent
commit
eb023bcfad
  1. 7
      flask/json.py

7
flask/json.py

@ -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

Loading…
Cancel
Save