genshi/mirror: markup/filters.py annotate

annotate markup/filters.py @ 210:9fd7535883f2 trunk

Fix regression introduced in [258]. More fixes needed?

author	cmlenz
date	Tue, 29 Aug 2006 17:35:32 +0000
parents	2f30ce3fb85e
children

rev	line source
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	1 # -- coding: utf-8 --
5479aae32f5a Initial import. cmlenz parents: diff changeset	2 #
66 59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org. cmlenz parents: 54 diff changeset	3 # Copyright (C) 2006 Edgewall Software
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	4 # All rights reserved.
5479aae32f5a Initial import. cmlenz parents: diff changeset	5 #
5479aae32f5a Initial import. cmlenz parents: diff changeset	6 # This software is licensed as described in the file COPYING, which
5479aae32f5a Initial import. cmlenz parents: diff changeset	7 # you should have received as part of this distribution. The terms
66 59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org. cmlenz parents: 54 diff changeset	8 # are also available at http://markup.edgewall.org/wiki/License.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	9 #
5479aae32f5a Initial import. cmlenz parents: diff changeset	10 # This software consists of voluntary contributions made by many
5479aae32f5a Initial import. cmlenz parents: diff changeset	11 # individuals. For the exact contribution history, see the revision
66 59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org. cmlenz parents: 54 diff changeset	12 # history and logs, available at http://markup.edgewall.org/log/.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	13
5479aae32f5a Initial import. cmlenz parents: diff changeset	14 """Implementation of a number of stream filters."""
5479aae32f5a Initial import. cmlenz parents: diff changeset	15
5479aae32f5a Initial import. cmlenz parents: diff changeset	16 try:
5479aae32f5a Initial import. cmlenz parents: diff changeset	17 frozenset
5479aae32f5a Initial import. cmlenz parents: diff changeset	18 except NameError:
5479aae32f5a Initial import. cmlenz parents: diff changeset	19 from sets import ImmutableSet as frozenset
5479aae32f5a Initial import. cmlenz parents: diff changeset	20 import re
5479aae32f5a Initial import. cmlenz parents: diff changeset	21
182 2f30ce3fb85e Renamed `Attributes` to `Attrs` to reduce the verbosity. cmlenz parents: 145 diff changeset	22 from markup.core import Attrs, Namespace, stripentities
145 47bbd9d2a5af * Fix error in expression evaluation when the expression evaluates to an iterable that does not produce event tuples. cmlenz parents: 142 diff changeset	23 from markup.core import END, END_NS, START, START_NS
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	24
123 10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	25 __all__ = ['HTMLSanitizer', 'IncludeFilter']
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	26
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	27
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	28 class HTMLSanitizer(object):
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	29 """A filter that removes potentially dangerous HTML tags and attributes
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	30 from the stream.
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	31 """
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	32
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	33 _SAFE_TAGS = frozenset(['a', 'abbr', 'acronym', 'address', 'area', 'b',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	34 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	35 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	36 'em', 'fieldset', 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	37 'hr', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	38 'menu', 'ol', 'optgroup', 'option', 'p', 'pre', 'q', 's', 'samp',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	39 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	40 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	41 'ul', 'var'])
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	42
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	43 _SAFE_ATTRS = frozenset(['abbr', 'accept', 'accept-charset', 'accesskey',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	44 'action', 'align', 'alt', 'axis', 'bgcolor', 'border', 'cellpadding',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	45 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	46 'clear', 'cols', 'colspan', 'color', 'compact', 'coords', 'datetime',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	47 'dir', 'disabled', 'enctype', 'for', 'frame', 'headers', 'height',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	48 'href', 'hreflang', 'hspace', 'id', 'ismap', 'label', 'lang',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	49 'longdesc', 'maxlength', 'media', 'method', 'multiple', 'name',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	50 'nohref', 'noshade', 'nowrap', 'prompt', 'readonly', 'rel', 'rev',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	51 'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	52 'span', 'src', 'start', 'style', 'summary', 'tabindex', 'target',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	53 'title', 'type', 'usemap', 'valign', 'value', 'vspace', 'width'])
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	54 _URI_ATTRS = frozenset(['action', 'background', 'dynsrc', 'href', 'lowsrc',
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	55 'src'])
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	56 _SAFE_SCHEMES = frozenset(['file', 'ftp', 'http', 'https', 'mailto', None])
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	57
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	58 def __call__(self, stream, ctxt=None):
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	59 waiting_for = None
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	60
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	61 for kind, data, pos in stream:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	62 if kind is START:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	63 if waiting_for:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	64 continue
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	65 tag, attrib = data
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	66 if tag not in self._SAFE_TAGS:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	67 waiting_for = tag
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	68 continue
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	69
182 2f30ce3fb85e Renamed `Attributes` to `Attrs` to reduce the verbosity. cmlenz parents: 145 diff changeset	70 new_attrib = Attrs()
123 10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	71 for attr, value in attrib:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	72 value = stripentities(value)
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	73 if attr not in self._SAFE_ATTRS:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	74 continue
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	75 elif attr in self._URI_ATTRS:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	76 # Don't allow URI schemes such as "javascript:"
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	77 if self._get_scheme(value) not in self._SAFE_SCHEMES:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	78 continue
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	79 elif attr == 'style':
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	80 # Remove dangerous CSS declarations from inline styles
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	81 decls = []
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	82 for decl in filter(None, value.split(';')):
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	83 is_evil = False
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	84 if 'expression' in decl:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	85 is_evil = True
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	86 for m in re.finditer(r'url\s*\(([^)]+)', decl):
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	87 if self._get_scheme(m.group(1)) not in self._SAFE_SCHEMES:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	88 is_evil = True
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	89 break
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	90 if not is_evil:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	91 decls.append(decl.strip())
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	92 if not decls:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	93 continue
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	94 value = '; '.join(decls)
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	95 new_attrib.append((attr, value))
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	96
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	97 yield kind, (tag, new_attrib), pos
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	98
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	99 elif kind is END:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	100 tag = data
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	101 if waiting_for:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	102 if waiting_for == tag:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	103 waiting_for = None
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	104 else:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	105 yield kind, data, pos
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	106
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	107 else:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	108 if not waiting_for:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	109 yield kind, data, pos
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	110
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	111 def _get_scheme(self, text):
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	112 if ':' not in text:
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	113 return None
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	114 chars = [char for char in text.split(':', 1)[0] if char.isalnum()]
10279d2eeec9 Fix for #18: whitespace in space-sensitive elements such as `<pre>` and `<textarea>` is now preserved. cmlenz parents: 113 diff changeset	115 return ''.join(chars).lower()
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	116
5479aae32f5a Initial import. cmlenz parents: diff changeset	117
5479aae32f5a Initial import. cmlenz parents: diff changeset	118 class IncludeFilter(object):
5479aae32f5a Initial import. cmlenz parents: diff changeset	119 """Template filter providing (very) basic XInclude support
5479aae32f5a Initial import. cmlenz parents: diff changeset	120 (see http://www.w3.org/TR/xinclude/) in templates.
5479aae32f5a Initial import. cmlenz parents: diff changeset	121 """
5479aae32f5a Initial import. cmlenz parents: diff changeset	122
18 5420cfe42d36 Actually make use of the `markup.core.Namespace` class, and add a couple of doctests. cmlenz parents: 17 diff changeset	123 NAMESPACE = Namespace('http://www.w3.org/2001/XInclude')
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	124
17 74cc70129d04 Refactoring to address #6: all match templates are now processed by a single filter, which means that match templates added by included templates are properly applied. A side effect of this refactoring is that `Context` objects may not be reused across multiple template processing runs. cmlenz parents: 15 diff changeset	125 def __init__(self, loader):
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	126 """Initialize the filter.
5479aae32f5a Initial import. cmlenz parents: diff changeset	127
5479aae32f5a Initial import. cmlenz parents: diff changeset	128 @param loader: the `TemplateLoader` to use for resolving references to
5479aae32f5a Initial import. cmlenz parents: diff changeset	129 external template files
5479aae32f5a Initial import. cmlenz parents: diff changeset	130 """
5479aae32f5a Initial import. cmlenz parents: diff changeset	131 self.loader = loader
5479aae32f5a Initial import. cmlenz parents: diff changeset	132
142 349b3ff5367d Minor cleanup in XInclude filter. cmlenz parents: 123 diff changeset	133 def __call__(self, stream, ctxt=None):
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	134 """Filter the stream, processing any XInclude directives it may
5479aae32f5a Initial import. cmlenz parents: diff changeset	135 contain.
5479aae32f5a Initial import. cmlenz parents: diff changeset	136
142 349b3ff5367d Minor cleanup in XInclude filter. cmlenz parents: 123 diff changeset	137 @param stream: the markup event stream to filter
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	138 @param ctxt: the template context
5479aae32f5a Initial import. cmlenz parents: diff changeset	139 """
145 47bbd9d2a5af * Fix error in expression evaluation when the expression evaluates to an iterable that does not produce event tuples. cmlenz parents: 142 diff changeset	140 from markup.template import TemplateError, TemplateNotFound
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	141
142 349b3ff5367d Minor cleanup in XInclude filter. cmlenz parents: 123 diff changeset	142 ns_prefixes = []
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	143 in_fallback = False
5479aae32f5a Initial import. cmlenz parents: diff changeset	144 include_href, fallback_stream = None, None
69 c40a5dcd2b55 A couple of minor performance improvements. cmlenz parents: 66 diff changeset	145 namespace = self.NAMESPACE
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	146
5479aae32f5a Initial import. cmlenz parents: diff changeset	147 for kind, data, pos in stream:
5479aae32f5a Initial import. cmlenz parents: diff changeset	148
69 c40a5dcd2b55 A couple of minor performance improvements. cmlenz parents: 66 diff changeset	149 if kind is START and not in_fallback and data[0] in namespace:
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	150 tag, attrib = data
5479aae32f5a Initial import. cmlenz parents: diff changeset	151 if tag.localname == 'include':
5479aae32f5a Initial import. cmlenz parents: diff changeset	152 include_href = attrib.get('href')
5479aae32f5a Initial import. cmlenz parents: diff changeset	153 elif tag.localname == 'fallback':
5479aae32f5a Initial import. cmlenz parents: diff changeset	154 in_fallback = True
5479aae32f5a Initial import. cmlenz parents: diff changeset	155 fallback_stream = []
5479aae32f5a Initial import. cmlenz parents: diff changeset	156
69 c40a5dcd2b55 A couple of minor performance improvements. cmlenz parents: 66 diff changeset	157 elif kind is END and data in namespace:
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	158 if data.localname == 'include':
5479aae32f5a Initial import. cmlenz parents: diff changeset	159 try:
5479aae32f5a Initial import. cmlenz parents: diff changeset	160 if not include_href:
5479aae32f5a Initial import. cmlenz parents: diff changeset	161 raise TemplateError('Include misses required '
5479aae32f5a Initial import. cmlenz parents: diff changeset	162 'attribute "href"')
21 b4d17897d053 * Include paths are now interpreted relative to the path of the including template. Closes #3. cmlenz parents: 18 diff changeset	163 template = self.loader.load(include_href,
b4d17897d053 * Include paths are now interpreted relative to the path of the including template. Closes #3. cmlenz parents: 18 diff changeset	164 relative_to=pos[0])
17 74cc70129d04 Refactoring to address #6: all match templates are now processed by a single filter, which means that match templates added by included templates are properly applied. A side effect of this refactoring is that `Context` objects may not be reused across multiple template processing runs. cmlenz parents: 15 diff changeset	165 for event in template.generate(ctxt):
74cc70129d04 Refactoring to address #6: all match templates are now processed by a single filter, which means that match templates added by included templates are properly applied. A side effect of this refactoring is that `Context` objects may not be reused across multiple template processing runs. cmlenz parents: 15 diff changeset	166 yield event
13 f9001cd6785b Match directives should now also be applied when included indirectly. cmlenz parents: 12 diff changeset	167
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	168 except TemplateNotFound:
5479aae32f5a Initial import. cmlenz parents: diff changeset	169 if fallback_stream is None:
5479aae32f5a Initial import. cmlenz parents: diff changeset	170 raise
5479aae32f5a Initial import. cmlenz parents: diff changeset	171 for event in fallback_stream:
5479aae32f5a Initial import. cmlenz parents: diff changeset	172 yield event
5479aae32f5a Initial import. cmlenz parents: diff changeset	173
5479aae32f5a Initial import. cmlenz parents: diff changeset	174 include_href = None
5479aae32f5a Initial import. cmlenz parents: diff changeset	175 fallback_stream = None
17 74cc70129d04 Refactoring to address #6: all match templates are now processed by a single filter, which means that match templates added by included templates are properly applied. A side effect of this refactoring is that `Context` objects may not be reused across multiple template processing runs. cmlenz parents: 15 diff changeset	176
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	177 elif data.localname == 'fallback':
5479aae32f5a Initial import. cmlenz parents: diff changeset	178 in_fallback = False
5479aae32f5a Initial import. cmlenz parents: diff changeset	179
5479aae32f5a Initial import. cmlenz parents: diff changeset	180 elif in_fallback:
5479aae32f5a Initial import. cmlenz parents: diff changeset	181 fallback_stream.append((kind, data, pos))
5479aae32f5a Initial import. cmlenz parents: diff changeset	182
69 c40a5dcd2b55 A couple of minor performance improvements. cmlenz parents: 66 diff changeset	183 elif kind is START_NS and data[1] == namespace:
12 97423376736e Make the XInclude filter track namespace context, to enable it to omit `END_NS` events for the XInclude namespace. cmlenz parents: 10 diff changeset	184 ns_prefixes.append(data[0])
97423376736e Make the XInclude filter track namespace context, to enable it to omit `END_NS` events for the XInclude namespace. cmlenz parents: 10 diff changeset	185
69 c40a5dcd2b55 A couple of minor performance improvements. cmlenz parents: 66 diff changeset	186 elif kind is END_NS and data in ns_prefixes:
12 97423376736e Make the XInclude filter track namespace context, to enable it to omit `END_NS` events for the XInclude namespace. cmlenz parents: 10 diff changeset	187 ns_prefixes.pop()
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	188
5479aae32f5a Initial import. cmlenz parents: diff changeset	189 else:
5479aae32f5a Initial import. cmlenz parents: diff changeset	190 yield kind, data, pos

Mercurial > genshi > mirror

annotate markup/filters.py @ 210:9fd7535883f2 trunk