genshi/genshi-test: markup/template.py comparison

More performance improvements... this time for whitespace normalization and template loops.

comparison

equal deleted inserted replaced

-:e82d1bb07464
+:3b75c6730b29
 def __call__(self, stream, ctxt, directives):
 iterable = self.expr.evaluate(ctxt)
 if iterable is not None:
 stream = list(stream)
+scope = {}
+targets = self.targets
 for item in iter(iterable):
-if len(self.targets) == 1:
+if len(targets) == 1:
-item = [item]
+scope[targets[0]] = item
-scope = {}
+else:
-for idx, name in enumerate(self.targets):
+for idx, name in enumerate(targets):
 scope[name] = item[idx]
 ctxt.push(**scope)
 for event in _apply_directives(stream, ctxt, directives):
 yield event
 ctxt.pop()
 substream = _apply_directives(substream, ctxt, directives)
 for filter_ in (self._eval, self._match, self._flatten):
 substream = filter_(substream, ctxt)
 for event in substream:
 yield event
-continue
 else:
 yield kind, data, pos
 def _match(self, stream, ctxt=None, match_templates=None):
 """Internal stream filter that applies any defined match templates
 for kind, data, pos in stream:
 # We (currently) only care about start and end events for matching
 # We might care about namespace events in the future, though
-if kind not in (START, END):
+if not match_templates or kind not in (START, END):
 yield kind, data, pos
 continue
 for idx, (test, path, template, directives) in \
 enumerate(match_templates):

Mercurial > genshi > genshi-test