Mercurial > genshi > mirror
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1029:7d4414a4a5d0 | 1031:5dccab13ec85 |
|---|---|
| 282 new_attrs.append((name, value)) | 282 new_attrs.append((name, value)) |
| 283 data = tag, Attrs(new_attrs) | 283 data = tag, Attrs(new_attrs) |
| 284 | 284 |
| 285 yield kind, data, pos | 285 yield kind, data, pos |
| 286 | 286 |
| 287 def _prepare(self, stream): | 287 def _prepare(self, stream, inlined=None): |
| 288 return Template._prepare(self, | 288 return Template._prepare( |
| 289 self._extract_includes(self._interpolate_attrs(stream)) | 289 self, self._extract_includes(self._interpolate_attrs(stream)), |
| 290 ) | 290 inlined=inlined) |
| 291 | 291 |
| 292 def add_directives(self, namespace, factory): | 292 def add_directives(self, namespace, factory): |
| 293 """Register a custom `DirectiveFactory` for a given namespace. | 293 """Register a custom `DirectiveFactory` for a given namespace. |
| 294 | 294 |
| 295 :param namespace: the namespace URI | 295 :param namespace: the namespace URI |