Bug: when using @view, returning an error response results in exception

The @view wrapper expects a dictionary of vars. It
tries to update the defaults with the returned values,
and this fails for errors.

The bottle.py patch checks and only updates and calls
the template if the result is a dict.

The app.py patch raises errors instead of using return, and
so escapes the view processing.

Missing: test cases

bottle.py

@@ -1479,8 +1479,11 @@ def decorator(func):
         @functools.wraps(func)
         def wrapper(*args, **kargs):
             tplvars = dict(defaults)
-            tplvars.update(func(*args, **kargs))
-            return template(tpl_name, **tplvars)
+            result = func(*args, **kargs)
+            if isinstance(result, dict):
+                tplvars.update(result)
+                return template(tpl_name, **tplvars)
+            return result
         return wrapper
     return decorator
 

homepage/app.py

@@ -112,7 +112,7 @@ def page(name='start'):
     if p.exists:
         return dict(page=p)
     else:
-        return bottle.HTTPError(404, 'Page not found')
+        raise bottle.HTTPError(404, 'Page not found') # raise to escape the view...
 
 
 @route('/rss.xml')