From ca914bd419dfe4f61a748c3a73d476068b6ec3b9 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Tue, 21 Apr 2015 23:10:03 -0700 Subject: [PATCH] Use BadRequest instead of JSONBadRequest. JSONBadRequest is removed in Flask version 0.10. BadRequest is backwards compatible with Flask 0.9. --- src/octoprint/server/api/printer.py | 4 ++-- src/octoprint/server/api/printer_profiles.py | 6 +++--- src/octoprint/server/api/settings.py | 4 ++-- src/octoprint/server/api/slicing.py | 8 ++++---- src/octoprint/server/api/users.py | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py index 4d085950..f93174e9 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 JSONBadRequest +from flask.exceptions import BadRequest import re from octoprint.settings import settings, valid_boolean_trues @@ -331,7 +331,7 @@ def printerCommand(): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) if "command" in data and "commands" in data: diff --git a/src/octoprint/server/api/printer_profiles.py b/src/octoprint/server/api/printer_profiles.py index 4f46a6b0..5c8ecc9d 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 JSONBadRequest +from flask.exceptions import BadRequest from octoprint.server.api import api, NO_CONTENT from octoprint.server.util.flask import restricted_access @@ -32,7 +32,7 @@ def printerProfilesAdd(): try: json_data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) if not "profile" in json_data: @@ -91,7 +91,7 @@ def printerProfilesUpdate(identifier): try: json_data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) if not "profile" in json_data: diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index ce838257..4c24cb2b 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 JSONBadRequest +from flask.exceptions import BadRequest from octoprint.events import eventManager, Events from octoprint.settings import settings @@ -138,7 +138,7 @@ def setSettings(): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) s = settings() diff --git a/src/octoprint/server/api/slicing.py b/src/octoprint/server/api/slicing.py index a1237f40..491fd1c1 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 JSONBadRequest +from flask.exceptions import BadRequest from octoprint.server import slicingManager from octoprint.server.util.flask import restricted_access @@ -75,7 +75,7 @@ def slicingAddSlicerProfile(slicer, name): try: json_data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) data = dict() @@ -114,7 +114,7 @@ def slicingPatchSlicerProfile(slicer, name): try: json_data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) data = dict() @@ -169,4 +169,4 @@ def _getSlicingProfileData(slicer, name, profile): result["displayName"] = profile.display_name if profile.description is not None: result["description"] = profile.description - return result \ No newline at end of file + return result diff --git a/src/octoprint/server/api/users.py b/src/octoprint/server/api/users.py index 1d442e4c..505d852c 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 JSONBadRequest +from flask.exceptions import BadRequest from flask.ext.login import current_user import octoprint.users as users @@ -41,7 +41,7 @@ def addUser(): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) name = data["name"] @@ -89,7 +89,7 @@ def updateUser(username): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) # change roles @@ -132,7 +132,7 @@ def changePasswordForUser(username): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) if not "password" in data.keys() or not data["password"]: @@ -173,7 +173,7 @@ def changeSettingsForUser(username): try: data = request.json - except JSONBadRequest: + except BadRequest: return make_response("Malformed JSON body in request", 400) try: