# HG changeset patch
# User cmlenz
# Date 1156872932 0
# Node ID c0c70dc5bf951c416c42c4b3a8c800f032fe9746
# Parent 5b422db0735996597a91dce6ffa9b098dcb12701
Fix regression introduced in [258]. More fixes needed?
diff --git a/markup/template.py b/markup/template.py
--- a/markup/template.py
+++ b/markup/template.py
@@ -1034,8 +1034,10 @@
# Recursively process the output
template = _apply_directives(template, ctxt, directives)
- for event in self._match(self._eval(template, ctxt),
- ctxt, match_templates[:idx] +
+ for event in self._match(self._eval(self._flatten(template,
+ ctxt),
+ ctxt), ctxt,
+ match_templates[:idx] +
match_templates[idx + 1:]):
yield event
diff --git a/markup/tests/template.py b/markup/tests/template.py
--- a/markup/tests/template.py
+++ b/markup/tests/template.py
@@ -579,6 +579,15 @@
""", str(tmpl.generate(tagname='sayhello')))
+ def test_content_directive_in_match(self):
+ tmpl = Template("""
+ I said something
.
+ bar
+ """)
+ self.assertEqual("""
+ I said bar
.
+ """, str(tmpl.generate()))
+
# FIXME
#def test_match_after_step(self):
# tmpl = Template("""