From 9e1111c2fbc2c7670eb489df0262a90417b96019 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Sun, 4 Jul 2010 17:21:13 +0200 Subject: [PATCH] Fixed JSON availability test. This fixes #77 --- flask/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flask/__init__.py b/flask/__init__.py index f6015a64..02141f56 100644 --- a/flask/__init__.py +++ b/flask/__init__.py @@ -17,8 +17,12 @@ from jinja2 import Markup, escape from flask.app import Flask, Request, Response from flask.config import Config -from flask.helpers import url_for, jsonify, json_available, flash, send_file, \ - get_flashed_messages, get_template_attribute, json +from flask.helpers import url_for, jsonify, json_available, flash, \ + send_file, get_flashed_messages, get_template_attribute from flask.globals import current_app, g, request, session, _request_ctx_stack from flask.module import Module from flask.templating import render_template, render_template_string + +# only import json if it's available +if json_available: + from flask.helpers import json