From 5a1b618ce0093a6939cf9b7c4e16925c82b94c51 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Thu, 23 Apr 2015 12:23:02 -0700 Subject: [PATCH 1/2] Allow flask 0.10 in setup.py. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1ad9df60..2a31ff8b 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ import versioneer # Requirements for our application INSTALL_REQUIRES = [ - "flask==0.9", + "flask>=0.9,<0.11", "werkzeug==0.8.3", "tornado==4.0.1", "sockjs-tornado>=1.0.0", From 013d2213980de587a62a687c7d52a771bfec236f Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Thu, 23 Apr 2015 13:14:44 -0700 Subject: [PATCH 2/2] BadRequest is actually in werkzeug.exceptions. --- src/octoprint/server/api/printer.py | 2 +- src/octoprint/server/api/printer_profiles.py | 2 +- src/octoprint/server/api/settings.py | 2 +- src/octoprint/server/api/slicing.py | 2 +- src/octoprint/server/api/users.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py index f93174e9..f544b833 100644 --- a/src/octoprint/server/api/printer.py +++ b/src/octoprint/server/api/printer.py @@ -6,7 +6,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" from flask import request, jsonify, make_response, Response -from flask.exceptions import BadRequest +from werkzeug.exceptions import BadRequest import re from octoprint.settings import settings, valid_boolean_trues diff --git a/src/octoprint/server/api/printer_profiles.py b/src/octoprint/server/api/printer_profiles.py index 5c8ecc9d..11168c95 100644 --- a/src/octoprint/server/api/printer_profiles.py +++ b/src/octoprint/server/api/printer_profiles.py @@ -9,7 +9,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import copy from flask import jsonify, make_response, request, url_for -from flask.exceptions import BadRequest +from werkzeug.exceptions import BadRequest from octoprint.server.api import api, NO_CONTENT from octoprint.server.util.flask import restricted_access diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index 4c24cb2b..2e9d213d 100644 --- a/src/octoprint/server/api/settings.py +++ b/src/octoprint/server/api/settings.py @@ -8,7 +8,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import logging from flask import request, jsonify, make_response -from flask.exceptions import BadRequest +from werkzeug.exceptions import BadRequest from octoprint.events import eventManager, Events from octoprint.settings import settings diff --git a/src/octoprint/server/api/slicing.py b/src/octoprint/server/api/slicing.py index 491fd1c1..d2b25466 100644 --- a/src/octoprint/server/api/slicing.py +++ b/src/octoprint/server/api/slicing.py @@ -6,7 +6,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" from flask import request, jsonify, make_response, url_for -from flask.exceptions import BadRequest +from werkzeug.exceptions import BadRequest from octoprint.server import slicingManager from octoprint.server.util.flask import restricted_access diff --git a/src/octoprint/server/api/users.py b/src/octoprint/server/api/users.py index 505d852c..19472d95 100644 --- a/src/octoprint/server/api/users.py +++ b/src/octoprint/server/api/users.py @@ -6,7 +6,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" from flask import request, jsonify, abort, make_response -from flask.exceptions import BadRequest +from werkzeug.exceptions import BadRequest from flask.ext.login import current_user import octoprint.users as users