From f50f2be335de4d9e7ddd6e855d3af2d6c618351e Mon Sep 17 00:00:00 2001 From: Jan Pokorný Date: Tue, 1 Apr 2014 18:17:00 +0200 Subject: filter: exception if parent doesn't expect observed child MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Discovered due/thanks to a typo in tests.filter.XMLTraverse.testDirectXSLT (fix upcoming). Signed-off-by: Jan Pokorný --- filter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'filter.py') diff --git a/filter.py b/filter.py index 931ff78..f66721f 100644 --- a/filter.py +++ b/filter.py @@ -244,8 +244,11 @@ class XMLFilter(Filter, MetaPlugin): # be applied and the result attached (0), or just merged # to the parent template (1 if not preserve-rest required, # 2 otherwise) - do_mix = parent[1].get(name, parent[1].get('*'))[1] \ + do_mix = parent[1].get(name, parent[1].get('*', (None, None)))[1] \ if parent else 0 + if do_mix is None: + raise RuntimeError("Parent does not expect `{0}' nor wildcard" + .format(name)) if do_mix and do_mix < will_mix: raise RuntimeError("Parent does not want preserve-rest while" " children wants to") -- cgit