From 1d8397875333ab4799236ac579538fa7383ea0ae Mon Sep 17 00:00:00 2001 From: chang-ning Date: Sat, 6 Jul 2019 08:29:57 +0800 Subject: [PATCH 1/3] Fix import json_available broken * Flask 1.1.0 or above remove json_available. ref: d362399e Signed-off-by: chang-ning --- flask_testing/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flask_testing/utils.py b/flask_testing/utils.py index 7362c40..0853b7a 100644 --- a/flask_testing/utils.py +++ b/flask_testing/utils.py @@ -35,7 +35,7 @@ from werkzeug import cached_property # Use Flask's preferred JSON module so that our runtime behavior matches. -from flask import json_available, templating, template_rendered +from flask import templating, template_rendered try: from flask import message_flashed @@ -45,8 +45,13 @@ message_flashed = None _is_message_flashed = False -if json_available: +json_available = True + +try: from flask import json +except ImportError: + json_available = False + # we'll use signals for template-related tests if # available in this version of Flask From 1a6311d77da482e51760279a14e1f0d26c028252 Mon Sep 17 00:00:00 2001 From: chang-ning Date: Sat, 6 Jul 2019 08:39:43 +0800 Subject: [PATCH 2/3] Add environment FLASK=1.1.0 & FLASK=1.0.2 Signed-off-by: chang-ning --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index f89e332..0198544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,24 @@ python: - "2.7" - "2.6" env: + - FLASK=1.1.0 + - FLASK=1.0.2 - FLASK=0.11.1 - FLASK=0.10.1 - FLASK=0.9 - FLASK=0.8.1 matrix: exclude: + - python: "2.6" + env: FLASK=1.1.0 + - python: "3.3" + env: FLASK=1.1.0 - python: "3.3" env: FLASK=0.9 - python: "3.3" env: FLASK=0.8.1 + - python: "3.4" + env: FLASK=1.1.0 - python: "3.4" env: FLASK=0.9 - python: "3.4" From 832570ba8cbc8873e9a71a12052c93a3a13414f1 Mon Sep 17 00:00:00 2001 From: chang-ning Date: Sat, 6 Jul 2019 09:06:37 +0800 Subject: [PATCH 3/3] Add environment python3.6 Signed-off-by: chang-ning --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0198544..e5f7cc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python python: + - "3.6" - "3.5" - "3.4" - "3.3" @@ -32,6 +33,10 @@ matrix: env: FLASK=0.9 - python: "3.5" env: FLASK=0.8.1 + - python: "3.6" + env: FLASK=0.9 + - python: "3.6" + env: FLASK=0.8.1 install: - pip install flask==$FLASK coverage - pip install -e .