From 63336757d40f9f03366627af0afc2e06a5102034 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Thu, 31 Jan 2019 16:48:19 +0000 Subject: [PATCH] Better handle missing error.message --- openflexure_microscope/api/exceptions.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openflexure_microscope/api/exceptions.py b/openflexure_microscope/api/exceptions.py index 86a141fc..fd605aca 100644 --- a/openflexure_microscope/api/exceptions.py +++ b/openflexure_microscope/api/exceptions.py @@ -2,8 +2,6 @@ from flask import jsonify from werkzeug.exceptions import default_exceptions from werkzeug.exceptions import HTTPException -from pprint import pprint - class JSONExceptionHandler(object): def __init__(self, app=None): @@ -11,7 +9,13 @@ class JSONExceptionHandler(object): self.init_app(app) def std_handler(self, error): - message = error.description if isinstance(error, HTTPException) else error.message + if isinstance(error, HTTPException): + message = error.description + elif hasattr(error, 'message'): + message = error.message + else: + message = str(error) + status_code = error.code if isinstance(error, HTTPException) else 500 response = {