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

Fixed JSON availability test. This fixes #77

Browse source
This commit is contained in:
Armin Ronacher 2010-07-04 17:21:13 +02:00
parent 362cf493c4
commit 9e1111c2fb
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/__init__.py
View file

@ -17,8 +17,12 @@ from jinja2 import Markup, escape
from flask.app import Flask, Request, Response from flask.app import Flask, Request, Response
from flask.config import Config from flask.config import Config
from flask.helpers import url_for, jsonify, json_available, flash, send_file, \ from flask.helpers import url_for, jsonify, json_available, flash, \
get_flashed_messages, get_template_attribute, json send_file, get_flashed_messages, get_template_attribute
from flask.globals import current_app, g, request, session, _request_ctx_stack from flask.globals import current_app, g, request, session, _request_ctx_stack
from flask.module import Module from flask.module import Module
from flask.templating import render_template, render_template_string from flask.templating import render_template, render_template_string
# only import json if it's available
if json_available:
from flask.helpers import json