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

comparison genshi/template/markup.py @ 902:09cc3627654c experimental-inline

Sync `experimental/inline` branch with [source:trunk@1126].

author	cmlenz
date	Fri, 23 Apr 2010 21:08:26 +0000
parents	de82830f8816
children

comparison

equal deleted inserted replaced

-:de82830f8816
+:09cc3627654c
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006-2008 Edgewall Software
+# Copyright (C) 2006-2010 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
 # are also available at http://genshi.edgewall.org/wiki/License.
 """Implementation of the template language for XML-based templates.
 >>> tmpl = MarkupTemplate('''<ul xmlns:py="http://genshi.edgewall.org/">
 ...   <li py:for="item in items">${item}</li>
 ... </ul>''')
->>> print tmpl.generate(items=[1, 2, 3])
+>>> print(tmpl.generate(items=[1, 2, 3]))
 <ul>
 <li>1</li><li>2</li><li>3</li>
 </ul>
 """
 self.add_directives(self.DIRECTIVE_NAMESPACE, self)
 def _init_filters(self):
 Template._init_filters(self)
 # Make sure the include filter comes after the match filter
-if self.loader:
+self.filters.remove(self._include)
-self.filters.remove(self._include)
+self.filters += [self._match, self._include]
-self.filters += [self._match]
-if self.loader:
-self.filters.append(self._include)
 def _parse(self, source, encoding):
 if not isinstance(source, Stream):
 source = XMLParser(source, filename=self.filename,
 encoding=encoding)
 if cls is None:
 raise BadDirectiveError(tag.localname,
 self.filepath, pos[1])
 args = dict([(name.localname, value) for name, value
 in attrs if not name.namespace])
-directives.append((cls, args, ns_prefix.copy(), pos))
+directives.append((factory.get_directive_index(cls), cls,
+args, ns_prefix.copy(), pos))
 strip = True
 new_attrs = []
 for name, value in attrs:
 if name.namespace == namespace:
 if cls is None:
 raise BadDirectiveError(name.localname,
 self.filepath, pos[1])
 if type(value) is list and len(value) == 1:
 value = value[0][1]
-directives.append((cls, value, ns_prefix.copy(),
+directives.append((factory.get_directive_index(cls),
-pos))
+cls, value, ns_prefix.copy(), pos))
 else:
 new_attrs.append((name, value))
 new_attrs = Attrs(new_attrs)
 if directives:
-directives.sort(self.compare_directives())
+directives.sort()
 dirmap[(depth, tag)] = (directives, len(new_stream),
 strip)
 new_stream.append((kind, (tag, new_attrs), pos))
 depth += 1
 href, parse = includes.pop()
 try:
 cls = {
 'xml': MarkupTemplate,
 'text': NewTextTemplate
-}[parse or 'xml']
+}.get(parse) or self.__class__
 except KeyError:
 raise TemplateSyntaxError('Invalid value for "parse" '
 'attribute of include',
 self.filepath, *pos[1:])
 stream.append((INCLUDE, (href, cls, fallback), pos))
 to the stream.
 """
 match_templates = ctxt._match_templates
 tail = []
-def _strip(stream):
+def _strip(stream, append=tail.append):
 depth = 1
+next = stream.next
 while 1:
-event = stream.next()
+event = next()
 if event[0] is START:
 depth += 1
 elif event[0] is END:
 depth -= 1
 if depth > 0:
 yield event
 else:
-tail[:] = [event]
+append(event)
 break
 for event in stream:
 # We (currently) only care about start and end events for matching
 pre_end = idx + 1
 if 'match_once' not in hints and 'not_recursive' in hints:
 pre_end -= 1
 inner = _strip(stream)
 if pre_end > 0:
-inner = self._match(inner, ctxt, end=pre_end, **vars)
+inner = self._match(inner, ctxt, start=start,
+end=pre_end, **vars)
 content = self._include(chain([event], inner, tail), ctxt)
 if 'not_buffered' not in hints:
 content = list(content)
+content = Stream(content)
 # Make the select() function available in the body of the
 # match template
 selected = [False]
 def select(path):
 selected[0] = True
-return Stream(content).select(path, namespaces, ctxt)
+return content.select(path, namespaces, ctxt)
 vars = dict(select=select)
 # Recursively process the output
 template = _apply_directives(template, directives, ctxt,
 vars)
 pass
 # Let the remaining match templates know about the last
 # event in the matched content, so they can update their
 # internal state accordingly
-for test in [mt[0] for mt in match_templates]:
+for test in [mt[0] for mt in match_templates[idx + 1:]]:
 test(tail[0], namespaces, ctxt, updateonly=True)
 break
 else: # no matches

Mercurial > genshi > genshi-test

comparison genshi/template/markup.py @ 902:09cc3627654c experimental-inline