Mercurial > genshi > mirror

diff genshi/template/markup.py @ 1033:348ba73df25c stable-0.6.x
Merge r1257 from trunk (fix for infinite template inlining).
author: hodgestar
date: Wed, 19 Mar 2014 13:56:46 +0000
parents: 203d981d314a
--- a/genshi/template/markup.py
+++ b/genshi/template/markup.py
@@ -284,10 +284,10 @@
 
             yield kind, data, pos
 
-    def _prepare(self, stream):
-        return Template._prepare(self,
-            self._extract_includes(self._interpolate_attrs(stream))
-        )
+    def _prepare(self, stream, inlined=None):
+        return Template._prepare(
+            self, self._extract_includes(self._interpolate_attrs(stream)),
+            inlined=inlined)
 
     def add_directives(self, namespace, factory):
         """Register a custom `DirectiveFactory` for a given namespace.