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

comparison markup/template.py @ 65:5c024cf58ecb

Support the use of directives as elements to reduce the need for using `py:strip`.

author	cmlenz
date	Sun, 09 Jul 2006 15:23:26 +0000
parents	33c2702cf6da
children	822089ae65ce

comparison

equal deleted inserted replaced

-:c612c73ae4ec
+:5c024cf58ecb
 * py:match directives use (basic) XPath expressions to match against input
 nodes, making match templates more powerful while keeping the syntax simple
 Todo items:
 * Improved error reporting
-* Support for using directives as elements and not just as attributes, reducing
-the need for wrapper elements with py:strip=""
 * Support for list comprehensions and generator expressions in expressions
 Random thoughts:
 * Is there any need to support py:extends and/or py:layout?
 * Could we generate byte code from expressions?
 </p>
 </div>
 """
 __slots__ = ['name', 'args', 'defaults', 'stream', 'directives']
+ATTRIBUTE = 'function'
 def __init__(self, args):
 Directive.__init__(self, None)
 ast = compiler.parse(args, 'eval').node
 self.args = []
 self.defaults = {}
 <li>1</li><li>2</li><li>3</li>
 </ul>
 """
 __slots__ = ['targets']
+ATTRIBUTE = 'each'
 def __init__(self, value):
 targets, value = value.split(' in ', 1)
 self.targets = [str(name.strip()) for name in targets.split(',')]
 Directive.__init__(self, value)
 <b>Hello</b>
 </div>
 """
 __slots__ = []
+ATTRIBUTE = 'test'
 def __call__(self, stream, ctxt, directives):
 if self.expr.evaluate(ctxt):
 return self._apply_directives(stream, ctxt, directives)
 return []
 Hello Dude
 </span>
 </div>
 """
 __slots__ = ['path', 'stream']
+ATTRIBUTE = 'path'
 def __init__(self, value):
 Directive.__init__(self, None)
 self.path = Path(value)
 self.stream = []
 `py:when` or `py:otherwise` block.  Behavior is also undefined if a
 `py:otherwise` occurs before `py:when` blocks.
 """
 __slots__ = ['matched', 'value']
+ATTRIBUTE = 'test'
 def __call__(self, stream, ctxt, directives):
 if self.expr:
 self.value = self.expr.evaluate(ctxt)
 self.matched = False
 ctxt.push(_choose=self)
 """Implementation of the `py:when` directive for nesting in a parent with
 the `py:choose` directive.
 See the documentation of `py:choose` for usage.
 """
+ATTRIBUTE = 'test'
 def __call__(self, stream, ctxt, directives):
 choose = ctxt['_choose']
 if choose.matched:
 return []
 value = self.expr.evaluate(ctxt)
 elif kind is Stream.START:
 # Record any directive attributes in start tags
 tag, attrib = data
 directives = []
+strip = False
+if tag in self.NAMESPACE:
+cls = self._dir_by_name.get(tag.localname)
+if cls is None:
+raise BadDirectiveError(tag, pos[0], pos[1])
+directives.append(cls(attrib.get(getattr(cls, 'ATTRIBUTE', None), '')))
+strip = True
 new_attrib = []
 for name, value in attrib:
 if name in self.NAMESPACE:
 cls = self._dir_by_name.get(name.localname)
 if cls is None:
-raise BadDirectiveError(name, self.filename, pos[1])
+raise BadDirectiveError(name, pos[0], pos[1])
-else:
+directives.append(cls(value))
-directives.append(cls(value))
 else:
 value = list(self._interpolate(value, *pos))
 new_attrib.append((name, value))
 if directives:
 directives.sort(lambda a, b: cmp(self._dir_order.index(a.__class__),
 self._dir_order.index(b.__class__)))
-dirmap[(depth, tag)] = (directives, len(stream))
+dirmap[(depth, tag)] = (directives, len(stream), strip)
 stream.append((kind, (tag, Attributes(new_attrib)), pos))
 depth += 1
 elif kind is Stream.END:
 stream.append((kind, data, pos))
 # If there have have directive attributes with the corresponding
 # start tag, move the events inbetween into a "subprogram"
 if (depth, data) in dirmap:
-directives, start_offset = dirmap.pop((depth, data))
+directives, start_offset, strip = dirmap.pop((depth, data))
 substream = stream[start_offset:]
+if strip:
+substream = substream[1:-1]
 stream[start_offset:] = [(Template.SUB,
 (directives, substream), pos)]
 elif kind is Stream.TEXT:
 for kind, data, pos in self._interpolate(data, *pos):

Mercurial > genshi > genshi-test

comparison markup/template.py @ 65:5c024cf58ecb