Merge pull request #240 from NextThought/issue238

Assign to macroname at the point of use, not definition.
malthe · May 8, 2017 · fed4ea5 · fed4ea5
2 parents a6df9f3 + 44cbc58
commit fed4ea5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/chameleon/tests/outputs/238.pt b/src/chameleon/tests/outputs/238.pt
@@ -3,5 +3,5 @@
 
 
 
-  <h1>page</h1>
+  <h1>macros['page']</h1>
 
diff --git a/src/chameleon/zpt/program.py b/src/chameleon/zpt/program.py
@@ -233,10 +233,21 @@ def visit_element(self, start, end, children):
                 inner = nodes.UseExternalMacro(
                     nodes.Value(use_macro), slots, False
                     )
+                macro_name = use_macro
             else:
                 inner = nodes.UseExternalMacro(
                     nodes.Value(extend_macro), slots, True
                     )
+                macro_name = extend_macro
+
+            # While the macro executes, it should have access to the name it was
+            # called with as 'macroname'. Splitting on / mirrors zope.tal and is a
+            # concession to the path expression syntax.
+            macro_name = macro_name.rsplit('/', 1)[-1]
+            inner = nodes.Define(
+                [nodes.Assignment(["macroname"], Static(ast.Str(macro_name)), True)],
+                inner,
+            )
         # -or- include tag
         else:
             content = nodes.Sequence(body)
@@ -555,10 +566,7 @@ def visit_element(self, start, end, children):
                     clause
                 )
 
-            self._macros[clause] =  nodes.Define(
-                [nodes.Assignment(["macroname"], Static(ast.Str(clause)), True)],
-                slot,
-            )
+            self._macros[clause] =  slot
             slot = nodes.UseInternalMacro(clause)
 
         slot = wrap(