genshi/mirror: genshi/template/inline.py comparison

comparison genshi/template/inline.py @ 356:cc04c70d1bbd experimental-inline

inline branch: minor tweaks, removed currently unsupported directives

author	cmlenz
date	Wed, 15 Nov 2006 21:47:24 +0000
parents	94639584725a
children	e9101f20b796

comparison

equal deleted inserted replaced

-:94639584725a
+:cc04c70d1bbd
 else:
 yield TEXT, unicode(obj), pos
 def _expand_text(obj):
 if obj is not None:
-# First check for a string, otherwise the iterable test below
-# succeeds, and the string will be chopped up into individual
-# characters
 if isinstance(obj, basestring):
-yield obj
+return [obj]
 elif hasattr(obj, '__iter__'):
-for event in _ensure(obj):
+return [e[1] for e in _ensure(obj) if e[0] is TEXT]
-if event[0] is TEXT:
-yield event[1]
 else:
-yield unicode(obj)
+return [unicode(obj)]
+return []
 def _assign(ast):
 buf = []
 def _build(node, indices):
 if isinstance(node, (compiler.ast.AssTuple, compiler.ast.Tuple)):
 sattrs = Attrs([(n, v) for n, v in attrs
 if isinstance(v, basestring)])
 for name, val in [(n, v) for n, v in attrs
 if not isinstance(v, basestring)]:
+if name not in p_qnames:
+qi[0] += 1
+yield w('Q%d = %r', qi[0], name)
+p_qnames[name] = qi[0]
 for subkind, subdata, subpos in val:
 if subkind is EXPR:
 if subdata not in p_exprs:
 ei[0] += 1
 yield w('E%d = %r', ei[0], subdata)
 return
 yield w()
 yield w('# Applying %r', directive)
-if isinstance(directive, DefDirective):
+if isinstance(directive, ForDirective):
-pass
-elif isinstance(directive, ForDirective):
 ei[0] += 1
 yield w('for v in E%d.evaluate(ctxt):', p_exprs[directive.expr])
 w.shift()
 yield w('ctxt.push(%s)', _assign(directive.target))
 for line in _apply(directives, stream):
 w.shift()
 for line in _apply(directives, stream):
 yield line
 w.unshift()
-elif isinstance(directive, WithDirective):
-for targets, expr in directive.vars:
-ei[0] += 1
-yield w('v = E%d.evaluate(ctxt)', p_exprs[directive.expr])
-for node, _ in targets:
-yield w('ctxt.push(%s)', _assign(node))
-for line in _apply(directives, stream):
-yield line
-yield w('ctxt.pop()')
-elif isinstance(directive, StripDirective):
-yield w('if E%d.evaluate(ctxt):', p_exprs[directive.expr])
-w.shift()
-lines = _apply(directives, stream)
-previous = lines.next()
-for line in lines:
-yield previous
-previous = line
-w.unshift()
-yield w('else:')
-w.shift()
-for line in _apply(directives, stream):
-yield line
-w.unshift()
 else:
 raise NotImplementedError
 yield w()
 sattrs = Attrs([(n, v) for n, v in attrs
 if isinstance(v, basestring)])
 at = p_attrs[tuple(sattrs)]
 if filter(None, [not isinstance(v, basestring) for n,v in attrs]):
-yield w('a = []')
+yield w('a = [(an, "".join(av)) for an, av in ([')
+w.shift()
 for name, value in [(n, v) for n, v in attrs
 if not isinstance(v, basestring)]:
-parts = []
+values = []
 for subkind, subdata, subpos in value:
 if subkind is EXPR:
-parts.append('list(_expand_text(E%d.evaluate(ctxt)))' %
+values.append('_expand_text(E%d.evaluate(ctxt))' %
 p_exprs[subdata])
 elif subkind is TEXT:
-parts.append('[%r]' % subdata)
+values.append('[%r]' % subdata)
-yield w('v = [v for v in %s if v is not None]',
+yield w('(Q%d, [v for v in %s if v is not None]),' % (
-' + '.join(parts))
+p_qnames[name], ' + '.join(values)
-yield w('if v:')
+))
-w.shift()
+w.unshift()
-yield w('a.append((%r, "".join(v)))', name)
+yield w(']) if av]')
-w.unshift()
 yield w('yield START, (Q%d, A%d | a), (f, %d, %d)', qn, at,
 *pos[1:])
 else:
 yield w('yield START, (Q%d, A%d), (f, %d, %d)', qn, at, *pos[1:])
 <h1 py:def="sayhi(name='world')" py:strip="">
 Hello, $name!
 </h1>
 ${sayhi()}
 <ul py:if="items">
-<li py:for="idx, item in enumerate(items)">
+<li py:for="idx, item in enumerate(items)"
+class="${idx % 2 and 'odd' or 'even'}">
 <span py:replace="item + 1">NUM</span>
 </li>
 </ul>
 </body>
 </html>"""

Mercurial > genshi > mirror

comparison genshi/template/inline.py @ 356:cc04c70d1bbd experimental-inline