- [feature/bug] Can now refer to context variables

  within extra arguments to <%block>, <%def>, i.e.
  <%block name="foo" cache_key="${somekey}">.
  Filters can also be used in this way, i.e.
  <%def name="foo()" filter="myfilter">
  then template.render(myfilter=some_callable)
  [ticket:180]

1 files changed, 11 insertions, 3 deletions

diff --git a/mako/parsetree.py b/mako/parsetree.py
index 9896dd8..98a8701 100644
--- a/mako/parsetree.py
+++ b/mako/parsetree.py
@@ -431,10 +431,13 @@ class DefTag(Tag):
         for c in self.function_decl.defaults:
             res += list(ast.PythonCode(c, **self.exception_kwargs).
                                     undeclared_identifiers)
-        return res + list(self.filter_args.\
+        return set(res).union(
+            self.filter_args.\
                             undeclared_identifiers.\
                             difference(filters.DEFAULT_ESCAPES.keys())
-                        )
+        ).union(
+            self.expression_undeclared_identifiers
+        )
 
 class BlockTag(Tag):
     __keyword__ = 'block'
@@ -487,7 +490,12 @@ class BlockTag(Tag):
         return self.body_decl.argnames
 
     def undeclared_identifiers(self):
-        return []
+        return (self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys())
+                ).union(self.expression_undeclared_identifiers)
+
+
 
 class CallTag(Tag):
     __keyword__ = 'call'