pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #865 from DanLipsitt/feature/flask-0.10

Browse source 
Use BadRequest instead of JSONBadRequest.
This commit is contained in:
Gina Häußge 2015-04-22 11:16:27 +02:00
commit a42c5edaa3
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/server/api/printer.py
View file

@ -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:

6
src/octoprint/server/api/printer_profiles.py
View file

@ -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:

4
src/octoprint/server/api/settings.py
View file

@ -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()

8
src/octoprint/server/api/slicing.py
View file

@ -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
return result

10
src/octoprint/server/api/users.py
View file

@ -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: