diff genshi/template/base.py @ 817:f7a5336dd389

Minor simplification in the expansion of dynamic attributes.
author cmlenz
date Mon, 09 Mar 2009 16:17:25 +0000
parents 3047d5d83ccc
children ce5ad2d540b3
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
 
Copyright (C) 2012-2017 Edgewall Software