genshi/mirror: genshi/template/markup.py annotate

annotate genshi/template/markup.py @ 609:6d4877844e28 trunk

Add support for Python code blocks in text templates using the new syntax.

author	cmlenz
date	Mon, 27 Aug 2007 22:39:01 +0000
parents	37ff75bb4301
children	5e358de79e4c

rev	line source
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	1 # -- coding: utf-8 --
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	2 #
408 4675d5cf6c67 Update copyright year for files modified this year. cmlenz parents: 407 diff changeset	3 # Copyright (C) 2006-2007 Edgewall Software
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	4 # All rights reserved.
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	5 #
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	6 # This software is licensed as described in the file COPYING, which
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	7 # you should have received as part of this distribution. The terms
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	8 # are also available at http://genshi.edgewall.org/wiki/License.
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	9 #
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	10 # This software consists of voluntary contributions made by many
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	11 # individuals. For the exact contribution history, see the revision
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	12 # history and logs, available at http://genshi.edgewall.org/log/.
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	13
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	14 """Markup templating engine."""
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	15
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	16 from itertools import chain
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	17
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	18 from genshi.core import Attrs, Namespace, Stream, StreamEventKind
405 5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	19 from genshi.core import START, END, START_NS, END_NS, TEXT, PI, COMMENT
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	20 from genshi.input import XMLParser
400 e29a94b3ba0c Renamed `genshi.template.core` to `genshi.template.base`, mainly to avoid confusion with `genshi.core`. cmlenz parents: 381 diff changeset	21 from genshi.template.base import BadDirectiveError, Template, \
475 b373f80f7763 Added include directive for text templates (#115). Thanks to Alastair for the original patch. cmlenz parents: 442 diff changeset	22 TemplateSyntaxError, _apply_directives, \
609 6d4877844e28 Add support for Python code blocks in text templates using the new syntax. cmlenz parents: 606 diff changeset	23 EXEC, INCLUDE, SUB
405 5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	24 from genshi.template.eval import Suite
407 f37d8e6acdf2 Move string interpolation code into separate module (`genshi.template.interpolation`). cmlenz parents: 405 diff changeset	25 from genshi.template.interpolation import interpolate
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	26 from genshi.template.directives import *
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	27
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 422 diff changeset	28 __all__ = ['MarkupTemplate']
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 422 diff changeset	29 __docformat__ = 'restructuredtext en'
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 422 diff changeset	30
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	31
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	32 class MarkupTemplate(Template):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	33 """Implementation of the template language for XML-based templates.
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	34
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	35 >>> tmpl = MarkupTemplate('''<ul xmlns:py="http://genshi.edgewall.org/">
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	36 ... <li py:for="item in items">${item}</li>
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	37 ... </ul>''')
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	38 >>> print tmpl.generate(items=[1, 2, 3])
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	39 <ul>
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	40 <li>1</li><li>2</li><li>3</li>
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	41 </ul>
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	42 """
427 55c574767df2 More API documentation. cmlenz parents: 425 diff changeset	43
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	44 DIRECTIVE_NAMESPACE = Namespace('http://genshi.edgewall.org/')
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	45 XINCLUDE_NAMESPACE = Namespace('http://www.w3.org/2001/XInclude')
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	46
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	47 directives = [('def', DefDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	48 ('match', MatchDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	49 ('when', WhenDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	50 ('otherwise', OtherwiseDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	51 ('for', ForDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	52 ('if', IfDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	53 ('choose', ChooseDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	54 ('with', WithDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	55 ('replace', ReplaceDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	56 ('content', ContentDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	57 ('attrs', AttrsDirective),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	58 ('strip', StripDirective)]
605 d0345c64da65 Text templates now default to rendering as plain text; it is no longer necessary to explicitly specify the "text" method to the `render()` or `serialize()` method of the generated markup stream. See tickets #62 and #118. cmlenz parents: 602 diff changeset	59 serializer = 'xml'
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	60
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	61 def __init__(self, source, basedir=None, filename=None, loader=None,
606 37ff75bb4301 Changed the default error handling mode to "strict". cmlenz parents: 605 diff changeset	62 encoding=None, lookup='strict', allow_exec=True):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	63 Template.__init__(self, source, basedir=basedir, filename=filename,
545 619340e2d805 Support for Python code blocks in templates can now be disabled. Closes #123. cmlenz parents: 520 diff changeset	64 loader=loader, encoding=encoding, lookup=lookup,
619340e2d805 Support for Python code blocks in templates can now be disabled. Closes #123. cmlenz parents: 520 diff changeset	65 allow_exec=allow_exec)
496 f56046e4b0de Fix bug introduced in [575]: includes weren't being processed inside match templates. cmlenz parents: 475 diff changeset	66 # Make sure the include filter comes after the match filter
f56046e4b0de Fix bug introduced in [575]: includes weren't being processed inside match templates. cmlenz parents: 475 diff changeset	67 if loader:
f56046e4b0de Fix bug introduced in [575]: includes weren't being processed inside match templates. cmlenz parents: 475 diff changeset	68 self.filters.remove(self._include)
609 6d4877844e28 Add support for Python code blocks in text templates using the new syntax. cmlenz parents: 606 diff changeset	69 self.filters += [self._match]
496 f56046e4b0de Fix bug introduced in [575]: includes weren't being processed inside match templates. cmlenz parents: 475 diff changeset	70 if loader:
f56046e4b0de Fix bug introduced in [575]: includes weren't being processed inside match templates. cmlenz parents: 475 diff changeset	71 self.filters.append(self._include)
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	72
374 b146277eb54a `MarkupTemplate`s can now be instantiated from markup streams, in addition to strings and file-like objects. Thanks to David Fraser for the patch. Closes #69. cmlenz parents: 364 diff changeset	73 def _parse(self, source, encoding):
381 b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	74 streams = [[]] # stacked lists of events of the "compiled" template
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	75 dirmap = {} # temporary mapping of directives to elements
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	76 ns_prefix = {}
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	77 depth = 0
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	78 fallbacks = []
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	79 includes = []
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	80
374 b146277eb54a `MarkupTemplate`s can now be instantiated from markup streams, in addition to strings and file-like objects. Thanks to David Fraser for the patch. Closes #69. cmlenz parents: 364 diff changeset	81 if not isinstance(source, Stream):
434 5692bc32ba5f * Better method to propogate the full path to the template file on parse errors. Supersedes r513. cmlenz parents: 427 diff changeset	82 source = XMLParser(source, filename=self.filename,
374 b146277eb54a `MarkupTemplate`s can now be instantiated from markup streams, in addition to strings and file-like objects. Thanks to David Fraser for the patch. Closes #69. cmlenz parents: 364 diff changeset	83 encoding=encoding)
b146277eb54a `MarkupTemplate`s can now be instantiated from markup streams, in addition to strings and file-like objects. Thanks to David Fraser for the patch. Closes #69. cmlenz parents: 364 diff changeset	84
b146277eb54a `MarkupTemplate`s can now be instantiated from markup streams, in addition to strings and file-like objects. Thanks to David Fraser for the patch. Closes #69. cmlenz parents: 364 diff changeset	85 for kind, data, pos in source:
381 b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	86 stream = streams[-1]
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	87
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	88 if kind is START_NS:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	89 # Strip out the namespace declaration for template directives
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	90 prefix, uri = data
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	91 ns_prefix[prefix] = uri
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	92 if uri not in (self.DIRECTIVE_NAMESPACE,
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	93 self.XINCLUDE_NAMESPACE):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	94 stream.append((kind, data, pos))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	95
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	96 elif kind is END_NS:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	97 uri = ns_prefix.pop(data, None)
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	98 if uri and uri not in (self.DIRECTIVE_NAMESPACE,
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	99 self.XINCLUDE_NAMESPACE):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	100 stream.append((kind, data, pos))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	101
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	102 elif kind is START:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	103 # Record any directive attributes in start tags
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	104 tag, attrs = data
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	105 directives = []
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	106 strip = False
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	107
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	108 if tag in self.DIRECTIVE_NAMESPACE:
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	109 cls = self._dir_by_name.get(tag.localname)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	110 if cls is None:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	111 raise BadDirectiveError(tag.localname, self.filepath,
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	112 pos[1])
552 b59d99d2f631 For directives used as elements, pass all attributes without a namespace to the directive class. This enables adding optional extra attributes to directives. cmlenz parents: 545 diff changeset	113 args = dict([(name.localname, value) for name, value
b59d99d2f631 For directives used as elements, pass all attributes without a namespace to the directive class. This enables adding optional extra attributes to directives. cmlenz parents: 545 diff changeset	114 in attrs if not name.namespace])
b59d99d2f631 For directives used as elements, pass all attributes without a namespace to the directive class. This enables adding optional extra attributes to directives. cmlenz parents: 545 diff changeset	115 directives.append((cls, args, ns_prefix.copy(), pos))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	116 strip = True
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	117
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	118 new_attrs = []
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	119 for name, value in attrs:
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	120 if name in self.DIRECTIVE_NAMESPACE:
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	121 cls = self._dir_by_name.get(name.localname)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	122 if cls is None:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	123 raise BadDirectiveError(name.localname,
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	124 self.filepath, pos[1])
362 fe40d34fb71d Follow-up to [431]: directives are no longer instantiated directly at parse time, but instead by the `attach()` method of the directive class (which replaces the `prepare()` method). cmlenz parents: 336 diff changeset	125 directives.append((cls, value, ns_prefix.copy(), pos))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	126 else:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	127 if value:
442 97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	128 value = list(interpolate(value, self.basedir,
97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	129 pos[0], pos[1], pos[2],
97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	130 lookup=self.lookup))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	131 if len(value) == 1 and value[0][0] is TEXT:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	132 value = value[0][1]
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	133 else:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	134 value = [(TEXT, u'', pos)]
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	135 new_attrs.append((name, value))
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	136 new_attrs = Attrs(new_attrs)
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	137
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	138 if directives:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	139 index = self._dir_order.index
362 fe40d34fb71d Follow-up to [431]: directives are no longer instantiated directly at parse time, but instead by the `attach()` method of the directive class (which replaces the `prepare()` method). cmlenz parents: 336 diff changeset	140 directives.sort(lambda a, b: cmp(index(a[0]), index(b[0])))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	141 dirmap[(depth, tag)] = (directives, len(stream), strip)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	142
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	143 if tag in self.XINCLUDE_NAMESPACE:
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	144 if tag.localname == 'include':
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	145 include_href = new_attrs.get('href')
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	146 if not include_href:
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	147 raise TemplateSyntaxError('Include misses required '
422 5d08a744636e More work to include absolute file paths in exceptions. cmlenz parents: 421 diff changeset	148 'attribute "href"',
5d08a744636e More work to include absolute file paths in exceptions. cmlenz parents: 421 diff changeset	149 self.filepath, *pos[1:])
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	150 includes.append(include_href)
381 b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	151 streams.append([])
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	152 elif tag.localname == 'fallback':
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	153 streams.append([])
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	154 fallbacks.append(streams[-1])
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	155
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	156 else:
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	157 stream.append((kind, (tag, new_attrs), pos))
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	158
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	159 depth += 1
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	160
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	161 elif kind is END:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	162 depth -= 1
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	163
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	164 if fallbacks and data == self.XINCLUDE_NAMESPACE['fallback']:
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	165 assert streams.pop() is fallbacks[-1]
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	166 elif data == self.XINCLUDE_NAMESPACE['include']:
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	167 fallback = None
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	168 if len(fallbacks) == len(includes):
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	169 fallback = fallbacks.pop()
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	170 streams.pop() # discard anything between the include tags
36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	171 # and the fallback element
381 b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	172 stream = streams[-1]
590 36b5a03534a0 Fix includes so that they again raise an exception when the included template is not found and no fallback has been provided. cmlenz parents: 552 diff changeset	173 stream.append((INCLUDE, (includes.pop(), fallback), pos))
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	174 else:
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 362 diff changeset	175 stream.append((kind, data, pos))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	176
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	177 # If there have have directive attributes with the corresponding
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	178 # start tag, move the events inbetween into a "subprogram"
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	179 if (depth, data) in dirmap:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	180 directives, start_offset, strip = dirmap.pop((depth, data))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	181 substream = stream[start_offset:]
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	182 if strip:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	183 substream = substream[1:-1]
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	184 stream[start_offset:] = [(SUB, (directives, substream),
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	185 pos)]
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	186
405 5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	187 elif kind is PI and data[0] == 'python':
545 619340e2d805 Support for Python code blocks in templates can now be disabled. Closes #123. cmlenz parents: 520 diff changeset	188 if not self.allow_exec:
619340e2d805 Support for Python code blocks in templates can now be disabled. Closes #123. cmlenz parents: 520 diff changeset	189 raise TemplateSyntaxError('Python code blocks not allowed',
619340e2d805 Support for Python code blocks in templates can now be disabled. Closes #123. cmlenz parents: 520 diff changeset	190 self.filepath, *pos[1:])
405 5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	191 try:
601 59fbd7586454 Simplify implementation of `py:with` directive by compiling to a `Suite`, instead of manually breaking up the statement and compiling each part to an `Expression`. Also, the first line of code in a `Suite` is now stored as the "function name" of the bytecode, so that it shows up in tracebacks. cmlenz parents: 590 diff changeset	192 suite = Suite(data[1], self.filepath, pos[1],
442 97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	193 lookup=self.lookup)
405 5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	194 except SyntaxError, err:
5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	195 raise TemplateSyntaxError(err, self.filepath,
5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	196 pos[1] + (err.lineno or 1) - 1,
5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	197 pos[2] + (err.offset or 0))
5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	198 stream.append((EXEC, suite, pos))
5340931530e2 Support for Python code blocks using the `<?python ?>` processing instruction. Closes #84. cmlenz parents: 400 diff changeset	199
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	200 elif kind is TEXT:
442 97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	201 for kind, data, pos in interpolate(data, self.basedir, pos[0],
97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	202 pos[1], pos[2],
97544725bb7f Back out [510] and instead implement configurable error handling modes. The default is the old 0.3.x behaviour, but more strict error handling is available as an option. cmlenz parents: 434 diff changeset	203 lookup=self.lookup):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	204 stream.append((kind, data, pos))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	205
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	206 elif kind is COMMENT:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	207 if not data.lstrip().startswith('!'):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	208 stream.append((kind, data, pos))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	209
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	210 else:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	211 stream.append((kind, data, pos))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	212
381 b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	213 assert len(streams) == 1
b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	214 return streams[0]
b9fc7a1f76ca Fix for #80: fallback only shown when the template to include wasn't found. In addition, the nesting of includes and fallback content should work correctly, and directives/expressions/etc inside fallback content are processed. Thanks to Christian Boos for the original patch and unit tests. cmlenz parents: 374 diff changeset	215
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	216 def _match(self, stream, ctxt, match_templates=None):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	217 """Internal stream filter that applies any defined match templates
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	218 to the stream.
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	219 """
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	220 if match_templates is None:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	221 match_templates = ctxt._match_templates
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	222
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	223 tail = []
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	224 def _strip(stream):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	225 depth = 1
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	226 while 1:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	227 event = stream.next()
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	228 if event[0] is START:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	229 depth += 1
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	230 elif event[0] is END:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	231 depth -= 1
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	232 if depth > 0:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	233 yield event
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	234 else:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	235 tail[:] = [event]
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	236 break
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	237
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	238 for event in stream:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	239
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	240 # We (currently) only care about start and end events for matching
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	241 # We might care about namespace events in the future, though
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	242 if not match_templates or (event[0] is not START and
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	243 event[0] is not END):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	244 yield event
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	245 continue
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	246
602 d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	247 for idx, (test, path, template, hints, namespaces, directives) \
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	248 in enumerate(match_templates):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	249
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	250 if test(event, namespaces, ctxt) is True:
602 d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	251 if 'match_once' in hints:
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	252 del match_templates[idx]
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	253 idx -= 1
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	254
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	255 # Let the remaining match templates know about the event so
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	256 # they get a chance to update their internal state
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	257 for test in [mt[0] for mt in match_templates[idx + 1:]]:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	258 test(event, namespaces, ctxt, updateonly=True)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	259
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	260 # Consume and store all events until an end event
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	261 # corresponding to this start event is encountered
602 d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	262 inner = _strip(stream)
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	263 if 'match_once' not in hints \
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	264 and 'not_recursive' not in hints:
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	265 inner = self._match(inner, ctxt, [match_templates[idx]])
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	266 content = list(self._include(chain([event], inner, tail),
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	267 ctxt))
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	268
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	269 for test in [mt[0] for mt in match_templates]:
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	270 test(tail[0], namespaces, ctxt, updateonly=True)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	271
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	272 # Make the select() function available in the body of the
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	273 # match template
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	274 def select(path):
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	275 return Stream(content).select(path, namespaces, ctxt)
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	276 ctxt.push(dict(select=select))
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	277
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	278 # Recursively process the output
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	279 template = _apply_directives(template, ctxt, directives)
602 d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	280 remaining = match_templates
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	281 if 'match_once' not in hints:
d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	282 remaining = remaining[:idx] + remaining[idx + 1:]
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	283 for event in self._match(self._eval(self._flatten(template,
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	284 ctxt),
602 d7b957e92ea9 Add runtime optimization hints for match templates. cmlenz parents: 601 diff changeset	285 ctxt), ctxt, remaining):
336 7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	286 yield event
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	287
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	288 ctxt.pop()
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	289 break
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	290
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	291 else: # no matches
7763f7aec949 Refactoring: `genshi.template` is now a package, it was getting way to crowded in that file. cmlenz parents: diff changeset	292 yield event

Mercurial > genshi > mirror

annotate genshi/template/markup.py @ 609:6d4877844e28 trunk