orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3235 from johnzeringue/better-return-type-error

Browse source 
Better error message when view return type is not supported
This commit is contained in:
David Lord 2019-05-31 12:50:59 -04:00 • committed by GitHub
commit 52f9aa7ed6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flask/app.py
View file

@ -27,6 +27,7 @@ from werkzeug.exceptions import (
default_exceptions,
)
from werkzeug.routing import BuildError, Map, RequestRedirect, RoutingException, Rule
from werkzeug.wrappers import BaseResponse
from . import cli, json
from ._compat import integer_types, reraise, string_types, text_type
@ -2063,7 +2064,7 @@ class Flask(_PackageBoundObject):
status = headers = None
elif isinstance(rv, dict):
rv = jsonify(rv)
else:
elif isinstance(rv, BaseResponse) or callable(rv):
# evaluate a WSGI callable, or coerce a different response
# class to the correct type
try:
@ -2071,11 +2072,18 @@ class Flask(_PackageBoundObject):
except TypeError as e:
new_error = TypeError(
"{e}\nThe view function did not return a valid"
" response. The return type must be a string, tuple,"
" response. The return type must be a string, dict, tuple,"
" Response instance, or WSGI callable, but it was a"
" {rv.__class__.__name__}.".format(e=e, rv=rv)
)
reraise(TypeError, new_error, sys.exc_info()[2])
else:
raise TypeError(
"The view function did not return a valid"
" response. The return type must be a string, dict, tuple,"
" Response instance, or WSGI callable, but it was a"
" {rv.__class__.__name__}.".format(rv=rv)
)
# prefer the status if it was provided
if status is not None: