Mercurial > genshi > genshi-test
comparison genshi/template/markup.py @ 629:cae74e2637c6
Revert second part of [726] (error on includes when no loader specified), which broke I18n extraction via the Babel plugin.
| author | cmlenz |
|---|---|
| date | Tue, 04 Sep 2007 11:51:58 +0000 |
| parents | 6a37018199fd |
| children | e0f12a6f3612 |
comparison
equal
deleted
inserted
replaced
| 628:693a7212b348 | 629:cae74e2637c6 |
|---|---|
| 140 index = self._dir_order.index | 140 index = self._dir_order.index |
| 141 directives.sort(lambda a, b: cmp(index(a[0]), index(b[0]))) | 141 directives.sort(lambda a, b: cmp(index(a[0]), index(b[0]))) |
| 142 dirmap[(depth, tag)] = (directives, len(stream), strip) | 142 dirmap[(depth, tag)] = (directives, len(stream), strip) |
| 143 | 143 |
| 144 if tag in self.XINCLUDE_NAMESPACE: | 144 if tag in self.XINCLUDE_NAMESPACE: |
| 145 if self._include not in self.filters: | |
| 146 raise TemplateSyntaxError('Include found but no ' | |
| 147 'template loader specified', | |
| 148 self.filepath, *pos[1:]) | |
| 149 if tag.localname == 'include': | 145 if tag.localname == 'include': |
| 150 include_href = new_attrs.get('href') | 146 include_href = new_attrs.get('href') |
| 151 if not include_href: | 147 if not include_href: |
| 152 raise TemplateSyntaxError('Include misses required ' | 148 raise TemplateSyntaxError('Include misses required ' |
| 153 'attribute "href"', | 149 'attribute "href"', |