Ticket #101: genshi-xinclude-parse-attr.patch

filters.py

@@ -137 +137 @@
         @param stream: the markup event stream to filter
         @param ctxt: the template context
         """
+        from genshi.template import MarkupTemplate, TextTemplate
         from genshi.template import TemplateError, TemplateNotFound
 
         ns_prefixes = []
         in_fallback = False
-        include_href, fallback_stream = None, None
+        include_href, parse, fallback_stream = None, None, None
         namespace = self.NAMESPACE
 
         for kind, data, pos in stream:
@@ -150 +151 @@
                 tag, attrib = data
                 if tag.localname == 'include':
                     include_href = attrib.get('href')
+                    parse = attrib.get('parse')
                 elif tag.localname == 'fallback':
                     in_fallback = True
                     fallback_stream = []
@@ -160 +162 @@
                         if not include_href:
                             raise TemplateError('Include misses required '
                                                 'attribute "href"')
+                        if parse == 'xml': cls = MarkupTemplate
+                        elif parse == 'text': cls = TextTemplate
+                        else: raise TemplateError('Unknown value "%s" for '
+                                                 'attribute "parse"' % 
+                                                 repr(parse))
                         template = self.loader.load(include_href,
-                                                    relative_to=pos[0])
+                                                    relative_to=pos[0],
+                                                    cls=cls)
                         for event in template.generate(ctxt):
                             yield event