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

Removed json_available hack

Browse source
This commit is contained in:
Armin Ronacher 2012-08-11 03:11:40 +01:00
parent 3f82d1b68e
commit c3d38a21c6
3 changed files with 8 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flask/__init__.py
View file

@ -20,7 +20,7 @@ from jinja2 import Markup, escape
from .app import Flask, Request, Response
from .config import Config
from .helpers import url_for, jsonify, json_available, flash, \
from .helpers import url_for, jsonify, flash, \
send_file, send_from_directory, get_flashed_messages, \
get_template_attribute, make_response, safe_join, \
stream_with_context
@ -37,8 +37,8 @@ from .signals import signals_available, template_rendered, request_started, \
request_finished, got_request_exception, request_tearing_down
# only import json if it's available
if json_available:
from .helpers import json
from .helpers import json
# backwards compat, goes away in 1.0
from .sessions import SecureCookieSession as Session
json_available = True