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

template/markup.py

@@ -26 +26 @@
 from genshi.template.interpolation import interpolate
 from genshi.template.loader import TemplateNotFound
 from genshi.template.directives import *
+from genshi.template.text import TextTemplate # for parse="text"
 
 if sys.version_info < (2, 4):
     _ctxt2dict = lambda ctxt: ctxt.frames[0]
@@ -85 +86 @@
         depth = 0
         in_fallback = 0
         include_href = None
+        include_cls = None
 
         if not isinstance(source, Stream):
             source = XMLParser(source, filename=self.filename,
@@ -154 +156 @@
                             raise TemplateSyntaxError('Include misses required '
                                                       'attribute "href"',
                                                       self.filepath, *pos[1:])
+                        parse = new_attrs.get('parse', MarkupTemplate)
+                        if parse == 'xml': include_cls = MarkupTemplate
+                        elif parse == 'text': include_cls = TextTemplate
+                        else: raise TemplateSyntaxError('Unknown value "%s" for ' 
+                                                        'attribute "parse"' % 
+                                                        repr(parse), 
+                                                        self.filepath, 
+                                                        *pos[1:]) 
                         streams.append([])
                     elif tag.localname == 'fallback':
                         in_fallback += 1
@@ -171 +181 @@
                 elif data == self.XINCLUDE_NAMESPACE['include']:
                     fallback = streams.pop()
                     stream = streams[-1]
-                    stream.append((INCLUDE, (include_href, fallback), pos))
+                    stream.append((INCLUDE, (include_href, include_cls, fallback), pos))
                 else:
                     stream.append((kind, data, pos))
 
@@ -226 +236 @@
     def _prepare(self, stream):
         for kind, data, pos in Template._prepare(self, stream):
             if kind is INCLUDE:
-                data = data[0], list(self._prepare(data[1]))
+                data = data[0], data[1], list(self._prepare(data[2]))
             yield kind, data, pos
 
     def _exec(self, stream, ctxt):
@@ -245 +255 @@
         """
         for event in stream:
             if event[0] is INCLUDE:
-                href, fallback = event[1]
+                href, template_cls, fallback = event[1]
                 if not isinstance(href, basestring):
                     parts = []
                     for subkind, subdata, subpos in self._eval(href, ctxt):
@@ -253 +263 @@
                             parts.append(subdata)
                     href = u''.join([x for x in parts if x is not None])
                 try:
-                    tmpl = self.loader.load(href, relative_to=event[2][0])
+                    tmpl = self.loader.load(href, relative_to=event[2][0], 
+                            cls=template_cls)
                     for event in tmpl.generate(ctxt):
                         yield event
                 except TemplateNotFound: