Mercurial > genshi > genshi-test
changeset 817:f7a5336dd389
Minor simplification in the expansion of dynamic attributes.
| author | cmlenz |
|---|---|
| date | Mon, 09 Mar 2009 16:17:25 +0000 |
| parents | 87e3fc814a33 |
| children | eab11d35c769 |
| files | genshi/template/base.py genshi/template/directives.py |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/template/base.py +++ b/genshi/template/base.py @@ -531,9 +531,7 @@ tag, attrs = data new_attrs = [] for name, substream in attrs: - if isinstance(substream, basestring): - value = substream - else: + if type(substream) is list: values = [] for event in self._flatten(substream, ctxt, **vars): if event[0] is TEXT: @@ -541,6 +539,8 @@ value = [x for x in values if x is not None] if not value: continue + else: + value = substream new_attrs.append((name, u''.join(value))) yield kind, (tag, Attrs(new_attrs)), pos
--- a/genshi/template/directives.py +++ b/genshi/template/directives.py @@ -16,8 +16,7 @@ from genshi.core import QName, Stream from genshi.path import Path from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \ - EXPR, _apply_directives, _eval_expr, \ - _exec_suite + EXPR, _apply_directives, _eval_expr from genshi.template.eval import Expression, ExpressionASTTransformer, \ _ast, _parse