diff options
author | Brandon Gilmore <brandon@mg2.org> | 2010-10-07 14:32:10 -0700 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2010-10-09 22:37:01 +0200 |
commit | 0ed3acdfb3fd94065d8b3218917a917a99a0914b (patch) | |
tree | cfc081364386974f3af6995bf1c81826b1b92f39 | |
parent | edd05f29d868825bb2de6d1bc1a8aadc9a2df6c7 (diff) | |
download | bottle-0ed3acdfb3fd94065d8b3218917a917a99a0914b.tar.gz |
made DictMixins usable with the @view decorator
-rwxr-xr-x | bottle.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1806,7 +1806,7 @@ def view(tpl_name, **defaults): @functools.wraps(func) def wrapper(*args, **kwargs): result = func(*args, **kwargs) - if isinstance(result, dict): + if isinstance(result, (dict, DictMixin)): tplvars = defaults.copy() tplvars.update(result) return template(tpl_name, **tplvars) |