[svn] small fixes

--HG--
branch : trunk

diff --git a/jinja/filters.py b/jinja/filters.py
index a7bb9d398233267eb066c1e09d7d91e09d643d79..1d0330ac28e319b1f02cda08935e963bfeb755b9 100644 (file)
--- a/jinja/filters.py
+++ b/jinja/filters.py
@@ -87,7 +87,7 @@ def do_escape(s, attribute=False):
     if attribute:
         s = s.replace('"', """)
     return s
-escape = stringfilter(do_escape)
+do_escape = stringfilter(do_escape)
 
 
 def do_addslashes(s):

diff --git a/tests/inheritance.py b/tests/inheritance.py
index 1c56168f49fcc8de2df8d9ff62177ce4808434de..8b1ebec3a2bebf77fb71be0194a2d2c81b718810 100644 (file)
--- a/tests/inheritance.py
+++ b/tests/inheritance.py
@@ -5,3 +5,9 @@ from jinja.parser import Parser
 from jinja.translators.python import PythonTranslator
 
 print PythonTranslator(e, e.loader.parse('index.html')).translate()
+
+tmpl = e.loader.load('index.html')
+print tmpl.render(navigation_items=[{
+    'url':          '/',
+    'caption':      'Index'
+}])