Mercurial > genshi > mirror
diff genshi/template/markup.py @ 1032:56fd1ca051af stable-0.7.x
Merge r1257 from trunk (fix for infinite template inlining).
author | hodgestar |
---|---|
date | Wed, 19 Mar 2014 13:54:59 +0000 |
parents | 2069c7a0059c |
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.