diff genshi/template/markup.py @ 1031:5dccab13ec85 trunk

Fix infinite recursion in template inlining (fixes #584).
author hodgestar
date Wed, 19 Mar 2014 13:52:01 +0000
parents cdb5d435d237
children
line wrap: on
line diff
--- 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.
Copyright (C) 2012-2017 Edgewall Software