Merge branch 'master' into module-support

2010-05-03 13:08:00 +02:00 · 2010-05-03 13:08:00 +02:00 · ce53d10236
commit ce53d10236
parent 36f659b82b 9248a7baca
2 changed files with 4 additions and 4 deletions
--- a/flask.py
+++ b/flask.py
@ -931,10 +931,7 @@ 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''
+            raise ValueError('View function did not return a response')
        if isinstance(rv, self.response_class):
            return rv
        if isinstance(rv, basestring):