Mercurial > genshi > genshi-test
comparison genshi/template/directives.py @ 907:bb813ef5fe25 experimental-inline
inline branch: merged r1129 from trunk.
| author | cmlenz |
|---|---|
| date | Wed, 28 Apr 2010 21:36:59 +0000 |
| parents | 09cc3627654c |
| children |
comparison
equal
deleted
inserted
replaced
| 906:be8d2d828be6 | 907:bb813ef5fe25 |
|---|---|
| 173 attrs = iter(attrs).next() | 173 attrs = iter(attrs).next() |
| 174 except StopIteration: | 174 except StopIteration: |
| 175 attrs = [] | 175 attrs = [] |
| 176 elif not isinstance(attrs, list): # assume it's a dict | 176 elif not isinstance(attrs, list): # assume it's a dict |
| 177 attrs = attrs.items() | 177 attrs = attrs.items() |
| 178 attrib -= [name for name, val in attrs if val is None] | 178 attrib |= [ |
| 179 attrib |= [(QName(name), unicode(val).strip()) for name, val | 179 (QName(n), v is not None and unicode(v).strip() or None) |
| 180 in attrs if val is not None] | 180 for n, v in attrs |
| 181 ] | |
| 181 yield kind, (tag, attrib), pos | 182 yield kind, (tag, attrib), pos |
| 182 for event in stream: | 183 for event in stream: |
| 183 yield event | 184 yield event |
| 184 | 185 |
| 185 return _apply_directives(_generate(), directives, ctxt, vars) | 186 return _apply_directives(_generate(), directives, ctxt, vars) |