From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 28 Feb 2007 19:41:12 +0000 (+0100)
Subject: [svn] small fixes
X-Git-Tag: 2.0rc1~484
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4ad284155ba7bd8e826d5c708ecc7ffc8a2e292;p=jinja2.git

[svn] small fixes

--HG--
branch : trunk
---

diff --git a/jinja/filters.py b/jinja/filters.py
index a7bb9d3..1d0330a 100644
--- a/jinja/filters.py
+++ b/jinja/filters.py
@@ -87,7 +87,7 @@ def do_escape(s, attribute=False):
     if attribute:
         s = s.replace('"', "&quot;")
     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 1c56168..8b1ebec 100644
--- 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'
+}])