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

Merge branch 'master' into module-support

Browse source
This commit is contained in:
Armin Ronacher 2010-04-24 17:47:24 +02:00
commit 5144d3b65a
4 changed files with 42 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flask.py
View file

@ -850,7 +850,7 @@ class Flask(_PackageBoundObject):
"""Converts the return value from a view function to a real
response object that is an instance of :attr:`response_class`.
The following types are allowd for `rv`:
The following types are allowed for `rv`:
======================= ===========================================
:attr:`response_class` the object is returned unchanged
@ -866,6 +866,11 @@ class Flask(_PackageBoundObject):
:param rv: the return value from the view function
"""
if rv is None:
from warnings import warn
warn(Warning('View function did not return a response'),
stacklevel=2)
return u''
if isinstance(rv, self.response_class):
return rv
if isinstance(rv, basestring):