maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'master' into module-support

Browse source
This commit is contained in:
Armin Ronacher 2010-05-03 13:08:00 +02:00
commit ce53d10236
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/patterns/index.rst
View file

@ -10,6 +10,9 @@ changes are they will open a database connection at the beginning of the
request and get the information of the currently logged in user. At the request and get the information of the currently logged in user. At the
end of the request, the database connection is closed again. end of the request, the database connection is closed again.
There are more user contributed snippets and patterns in the `Flask
Snippet Archives <http://flask.pocoo.org/snippets/>`_.
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2

5
flask.py
View file

@ -931,10 +931,7 @@ class Flask(_PackageBoundObject):
:param rv: the return value from the view function :param rv: the return value from the view function
""" """
if rv is None: if rv is None:
from warnings import warn raise ValueError('View function did not return a response')
warn(Warning('View function did not return a response'),
stacklevel=2)
return u''
if isinstance(rv, self.response_class): if isinstance(rv, self.response_class):
return rv return rv
if isinstance(rv, basestring): if isinstance(rv, basestring):