From 1a69c7d4bf4d87d00b5fb2551ea39ee7c932768b Mon Sep 17 00:00:00 2001 From: Justin Quick Date: Fri, 2 Jul 2010 15:11:02 -0400 Subject: [PATCH] look for json module in the right place. all tests now pass with the new module layout --- tests/flask_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/flask_tests.py b/tests/flask_tests.py index 1c5dc729..582f2e05 100644 --- a/tests/flask_tests.py +++ b/tests/flask_tests.py @@ -21,7 +21,7 @@ from contextlib import contextmanager from datetime import datetime from werkzeug import parse_date, parse_options_header from cStringIO import StringIO - +from flask.helpers import json example_path = os.path.join(os.path.dirname(__file__), '..', 'examples') sys.path.append(os.path.join(example_path, 'flaskr')) @@ -409,7 +409,7 @@ class JSONTestCase(unittest.TestCase): for url in '/kw', '/dict': rv = c.get(url) assert rv.mimetype == 'application/json' - assert flask.json.loads(rv.data) == d + assert json.loads(rv.data) == d def test_json_attr(self): app = flask.Flask(__name__) @@ -417,7 +417,7 @@ class JSONTestCase(unittest.TestCase): def add(): return unicode(flask.request.json['a'] + flask.request.json['b']) c = app.test_client() - rv = c.post('/add', data=flask.json.dumps({'a': 1, 'b': 2}), + rv = c.post('/add', data=json.dumps({'a': 1, 'b': 2}), content_type='application/json') assert rv.data == '3'