Mercurial > genshi > genshi-test
annotate markup/template.py @ 31:9a958398bed9
* More test cases for expression evaluation.
* Fixes for the new AST-based Python 2.5 evaluation.
| author | cmlenz |
|---|---|
| date | Wed, 28 Jun 2006 18:39:05 +0000 |
| parents | 4b6cee37ce62 |
| children | 3bc4778787c5 |
| rev | line source |
|---|---|
| 1 | 1 # -*- coding: utf-8 -*- |
| 2 # | |
| 3 # Copyright (C) 2006 Christopher Lenz | |
| 4 # All rights reserved. | |
| 5 # | |
| 6 # This software is licensed as described in the file COPYING, which | |
| 7 # you should have received as part of this distribution. The terms | |
| 27 | 8 # are also available at http://markup.cmlenz.net/wiki/License. |
| 1 | 9 # |
| 10 # This software consists of voluntary contributions made by many | |
| 11 # individuals. For the exact contribution history, see the revision | |
| 27 | 12 # history and logs, available at http://markup.cmlenz.net/log/. |
| 1 | 13 |
| 14 """Template engine that is compatible with Kid (http://kid.lesscode.org) to a | |
| 15 certain extent. | |
| 16 | |
| 17 Differences include: | |
| 18 * No generation of Python code for a template; the template is "interpreted" | |
| 19 * No support for <?python ?> processing instructions | |
| 20 * Expressions are evaluated in a more flexible manner, meaning you can use e.g. | |
| 21 attribute access notation to access items in a dictionary, etc | |
| 22 * Use of XInclude and match templates instead of Kid's py:extends/py:layout | |
| 23 directives | |
| 24 * Real (thread-safe) search path support | |
| 25 * No dependency on ElementTree (due to the lack of pos info) | |
| 26 * The original pos of parse events is kept throughout the processing | |
| 27 pipeline, so that errors can be tracked back to a specific line/column in | |
| 28 the template file | |
| 29 * py:match directives use (basic) XPath expressions to match against input | |
| 30 nodes, making match templates more powerful while keeping the syntax simple | |
| 31 | |
| 32 Todo items: | |
| 33 * Improved error reporting | |
| 34 * Support for using directives as elements and not just as attributes, reducing | |
| 35 the need for wrapper elements with py:strip="" | |
| 36 * Support for py:choose/py:when/py:otherwise (similar to XSLT) | |
| 37 * Support for list comprehensions and generator expressions in expressions | |
| 38 | |
| 39 Random thoughts: | |
| 40 * Is there any need to support py:extends and/or py:layout? | |
| 41 * Could we generate byte code from expressions? | |
| 42 """ | |
| 43 | |
| 44 import compiler | |
| 45 import os | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
46 import posixpath |
| 1 | 47 import re |
| 48 from StringIO import StringIO | |
| 49 | |
|
18
4cbebb15a834
Actually make use of the `markup.core.Namespace` class, and add a couple of doctests.
cmlenz
parents:
17
diff
changeset
|
50 from markup.core import Attributes, Namespace, Stream, StreamEventKind |
| 1 | 51 from markup.eval import Expression |
| 52 from markup.input import HTML, XMLParser, XML | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
53 from markup.path import Path |
| 1 | 54 |
| 55 __all__ = ['Context', 'BadDirectiveError', 'TemplateError', | |
| 56 'TemplateSyntaxError', 'TemplateNotFound', 'Template', | |
| 57 'TemplateLoader'] | |
| 58 | |
| 59 | |
| 60 class TemplateError(Exception): | |
| 61 """Base exception class for errors related to template processing.""" | |
| 62 | |
| 63 | |
| 64 class TemplateSyntaxError(TemplateError): | |
| 65 """Exception raised when an expression in a template causes a Python syntax | |
| 66 error.""" | |
| 67 | |
| 68 def __init__(self, message, filename='<string>', lineno=-1, offset=-1): | |
| 69 if isinstance(message, SyntaxError) and message.lineno is not None: | |
| 70 message = str(message).replace(' (line %d)' % message.lineno, '') | |
| 71 TemplateError.__init__(self, message) | |
| 72 self.filename = filename | |
| 73 self.lineno = lineno | |
| 74 self.offset = offset | |
| 75 | |
| 76 | |
| 77 class BadDirectiveError(TemplateSyntaxError): | |
| 78 """Exception raised when an unknown directive is encountered when parsing | |
| 79 a template. | |
| 80 | |
| 81 An unknown directive is any attribute using the namespace for directives, | |
| 82 with a local name that doesn't match any registered directive. | |
| 83 """ | |
| 84 | |
| 85 def __init__(self, name, filename='<string>', lineno=-1): | |
| 86 TemplateSyntaxError.__init__(self, 'Bad directive "%s"' % name.localname, | |
| 87 filename, lineno) | |
| 88 | |
| 89 | |
| 90 class TemplateNotFound(TemplateError): | |
| 91 """Exception raised when a specific template file could not be found.""" | |
| 92 | |
| 93 def __init__(self, name, search_path): | |
| 94 TemplateError.__init__(self, 'Template "%s" not found' % name) | |
| 95 self.search_path = search_path | |
| 96 | |
| 97 | |
| 98 class Context(object): | |
| 99 """A container for template input data. | |
| 100 | |
| 101 A context provides a stack of scopes. Template directives such as loops can | |
| 102 push a new scope on the stack with data that should only be available | |
| 103 inside the loop. When the loop terminates, that scope can get popped off | |
| 104 the stack again. | |
| 105 | |
| 106 >>> ctxt = Context(one='foo', other=1) | |
| 107 >>> ctxt.get('one') | |
| 108 'foo' | |
| 109 >>> ctxt.get('other') | |
| 110 1 | |
| 111 >>> ctxt.push(one='frost') | |
| 112 >>> ctxt.get('one') | |
| 113 'frost' | |
| 114 >>> ctxt.get('other') | |
| 115 1 | |
| 116 >>> ctxt.pop() | |
| 117 >>> ctxt.get('one') | |
| 118 'foo' | |
| 119 """ | |
| 120 | |
| 121 def __init__(self, **data): | |
| 122 self.stack = [data] | |
| 123 | |
| 124 def __getitem__(self, key): | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
125 """Get a variable's value, starting at the current context frame and |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
126 going upward. |
| 1 | 127 """ |
| 128 return self.get(key) | |
| 129 | |
| 130 def __repr__(self): | |
| 131 return repr(self.stack) | |
| 132 | |
| 133 def __setitem__(self, key, value): | |
| 134 """Set a variable in the current context.""" | |
| 135 self.stack[0][key] = value | |
| 136 | |
| 137 def get(self, key): | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
138 """Get a variable's value, starting at the current context frame and |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
139 going upward. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
140 """ |
| 1 | 141 for frame in self.stack: |
| 142 if key in frame: | |
| 143 return frame[key] | |
| 144 | |
| 145 def push(self, **data): | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
146 """Push a new context frame on the stack.""" |
| 1 | 147 self.stack.insert(0, data) |
| 148 | |
| 149 def pop(self): | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
150 """Pop the top-most context frame from the stack. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
151 |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
152 If the stack is empty, an `AssertionError` is raised. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
153 """ |
| 1 | 154 assert self.stack, 'Pop from empty context stack' |
| 155 self.stack.pop(0) | |
| 156 | |
| 157 | |
| 158 class Directive(object): | |
| 159 """Abstract base class for template directives. | |
| 160 | |
| 161 A directive is basically a callable that takes two parameters: `ctxt` is | |
| 162 the template data context, and `stream` is an iterable over the events that | |
| 163 the directive applies to. | |
| 164 | |
| 165 Directives can be "anonymous" or "registered". Registered directives can be | |
| 166 applied by the template author using an XML attribute with the | |
| 167 corresponding name in the template. Such directives should be subclasses of | |
| 31 | 168 this base class that can be instantiated with the value of the directive |
| 169 attribute as parameter. | |
| 1 | 170 |
| 171 Anonymous directives are simply functions conforming to the protocol | |
| 172 described above, and can only be applied programmatically (for example by | |
| 173 template filters). | |
| 174 """ | |
| 175 __slots__ = ['expr'] | |
| 176 | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
177 def __init__(self, value): |
| 1 | 178 self.expr = value and Expression(value) or None |
| 179 | |
| 180 def __call__(self, stream, ctxt): | |
| 181 raise NotImplementedError | |
| 182 | |
| 183 def __repr__(self): | |
| 184 expr = '' | |
| 185 if self.expr is not None: | |
| 186 expr = ' "%s"' % self.expr.source | |
| 187 return '<%s%s>' % (self.__class__.__name__, expr) | |
| 188 | |
| 189 | |
| 190 class AttrsDirective(Directive): | |
| 191 """Implementation of the `py:attrs` template directive. | |
| 192 | |
| 193 The value of the `py:attrs` attribute should be a dictionary. The keys and | |
| 194 values of that dictionary will be added as attributes to the element: | |
| 195 | |
| 196 >>> ctxt = Context(foo={'class': 'collapse'}) | |
| 197 >>> tmpl = Template('''<ul xmlns:py="http://purl.org/kid/ns#"> | |
| 198 ... <li py:attrs="foo">Bar</li> | |
| 199 ... </ul>''') | |
| 200 >>> print tmpl.generate(ctxt) | |
| 201 <ul> | |
| 202 <li class="collapse">Bar</li> | |
| 203 </ul> | |
| 204 | |
| 205 If the value evaluates to `None` (or any other non-truth value), no | |
| 206 attributes are added: | |
| 207 | |
| 208 >>> ctxt = Context(foo=None) | |
| 209 >>> print tmpl.generate(ctxt) | |
| 210 <ul> | |
| 211 <li>Bar</li> | |
| 212 </ul> | |
| 213 """ | |
| 214 def __call__(self, stream, ctxt): | |
| 215 kind, (tag, attrib), pos = stream.next() | |
| 216 attrs = self.expr.evaluate(ctxt) | |
| 217 if attrs: | |
|
5
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
218 attrib = Attributes(attrib[:]) |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
219 if not isinstance(attrs, list): # assume it's a dict |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
220 attrs = attrs.items() |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
221 for name, value in attrs: |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
222 if value is None: |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
223 attrib.remove(name) |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
224 else: |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
225 attrib.set(name, unicode(value).strip()) |
|
1add946decb8
Improved `py:attrs` directive so that it removes existing attributes if they evaluate to `None` (AFAICT matching Kid behavior).
cmlenz
parents:
1
diff
changeset
|
226 yield kind, (tag, attrib), pos |
| 1 | 227 for event in stream: |
| 228 yield event | |
| 229 | |
| 230 | |
| 231 class ContentDirective(Directive): | |
| 232 """Implementation of the `py:content` template directive. | |
| 233 | |
| 234 This directive replaces the content of the element with the result of | |
| 235 evaluating the value of the `py:content` attribute: | |
| 236 | |
| 237 >>> ctxt = Context(bar='Bye') | |
| 238 >>> tmpl = Template('''<ul xmlns:py="http://purl.org/kid/ns#"> | |
| 239 ... <li py:content="bar">Hello</li> | |
| 240 ... </ul>''') | |
| 241 >>> print tmpl.generate(ctxt) | |
| 242 <ul> | |
| 243 <li>Bye</li> | |
| 244 </ul> | |
| 245 """ | |
| 246 def __call__(self, stream, ctxt): | |
| 247 kind, data, pos = stream.next() | |
| 248 if kind is Stream.START: | |
| 249 yield kind, data, pos # emit start tag | |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
250 yield Template.EXPR, self.expr, pos |
| 6 | 251 previous = stream.next() |
| 252 for event in stream: | |
| 253 previous = event | |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
254 if previous is not None: |
|
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
255 yield previous |
| 1 | 256 |
| 257 | |
| 258 class DefDirective(Directive): | |
| 259 """Implementation of the `py:def` template directive. | |
| 260 | |
| 261 This directive can be used to create "Named Template Functions", which | |
| 262 are template snippets that are not actually output during normal | |
| 263 processing, but rather can be expanded from expressions in other places | |
| 264 in the template. | |
| 265 | |
| 266 A named template function can be used just like a normal Python function | |
| 267 from template expressions: | |
| 268 | |
| 269 >>> ctxt = Context(bar='Bye') | |
| 270 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 271 ... <p py:def="echo(greeting, name='world')" class="message"> | |
| 272 ... ${greeting}, ${name}! | |
| 273 ... </p> | |
| 274 ... ${echo('hi', name='you')} | |
| 275 ... </div>''') | |
| 276 >>> print tmpl.generate(ctxt) | |
| 277 <div> | |
| 278 <p class="message"> | |
| 279 hi, you! | |
| 280 </p> | |
| 281 </div> | |
| 282 | |
| 283 >>> ctxt = Context(bar='Bye') | |
| 284 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 285 ... <p py:def="echo(greeting, name='world')" class="message"> | |
| 286 ... ${greeting}, ${name}! | |
| 287 ... </p> | |
| 288 ... <div py:replace="echo('hello')"></div> | |
| 289 ... </div>''') | |
| 290 >>> print tmpl.generate(ctxt) | |
| 291 <div> | |
| 292 <p class="message"> | |
| 293 hello, world! | |
| 294 </p> | |
| 295 </div> | |
| 296 """ | |
| 297 __slots__ = ['name', 'args', 'defaults', 'stream'] | |
| 298 | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
299 def __init__(self, args): |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
300 Directive.__init__(self, None) |
| 1 | 301 ast = compiler.parse(args, 'eval').node |
| 302 self.args = [] | |
| 303 self.defaults = {} | |
| 304 if isinstance(ast, compiler.ast.CallFunc): | |
| 305 self.name = ast.node.name | |
| 306 for arg in ast.args: | |
| 307 if isinstance(arg, compiler.ast.Keyword): | |
| 308 self.args.append(arg.name) | |
| 309 self.defaults[arg.name] = arg.expr.value | |
| 310 else: | |
| 311 self.args.append(arg.name) | |
| 312 else: | |
| 313 self.name = ast.name | |
| 314 self.stream = [] | |
| 315 | |
| 316 def __call__(self, stream, ctxt): | |
| 317 self.stream = list(stream) | |
| 318 ctxt[self.name] = lambda *args, **kwargs: self._exec(ctxt, *args, | |
| 319 **kwargs) | |
| 320 return [] | |
| 321 | |
| 322 def _exec(self, ctxt, *args, **kwargs): | |
| 323 scope = {} | |
| 324 args = list(args) # make mutable | |
| 325 for name in self.args: | |
| 326 if args: | |
| 327 scope[name] = args.pop(0) | |
| 328 else: | |
| 329 scope[name] = kwargs.pop(name, self.defaults.get(name)) | |
| 330 ctxt.push(**scope) | |
| 331 for event in self.stream: | |
| 332 yield event | |
| 333 ctxt.pop() | |
| 334 | |
| 335 | |
| 336 class ForDirective(Directive): | |
| 31 | 337 """Implementation of the `py:for` template directive for repeating an |
| 338 element based on an iterable in the context data. | |
| 1 | 339 |
| 340 >>> ctxt = Context(items=[1, 2, 3]) | |
| 341 >>> tmpl = Template('''<ul xmlns:py="http://purl.org/kid/ns#"> | |
| 342 ... <li py:for="item in items">${item}</li> | |
| 343 ... </ul>''') | |
| 344 >>> print tmpl.generate(ctxt) | |
| 345 <ul> | |
| 346 <li>1</li><li>2</li><li>3</li> | |
| 347 </ul> | |
| 348 """ | |
| 349 __slots__ = ['targets'] | |
| 350 | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
351 def __init__(self, value): |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
352 targets, value = value.split(' in ', 1) |
| 1 | 353 self.targets = [str(name.strip()) for name in targets.split(',')] |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
354 Directive.__init__(self, value) |
| 1 | 355 |
| 356 def __call__(self, stream, ctxt): | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
357 iterable = self.expr.evaluate(ctxt) or [] |
| 1 | 358 if iterable is not None: |
| 359 stream = list(stream) | |
| 360 for item in iter(iterable): | |
| 361 if len(self.targets) == 1: | |
| 362 item = [item] | |
| 363 scope = {} | |
| 364 for idx, name in enumerate(self.targets): | |
| 365 scope[name] = item[idx] | |
| 366 ctxt.push(**scope) | |
| 367 for event in stream: | |
| 368 yield event | |
| 369 ctxt.pop() | |
| 370 | |
| 371 def __repr__(self): | |
| 372 return '<%s "%s in %s">' % (self.__class__.__name__, | |
| 373 ', '.join(self.targets), self.expr.source) | |
| 374 | |
| 375 | |
| 376 class IfDirective(Directive): | |
| 31 | 377 """Implementation of the `py:if` template directive for conditionally |
| 378 excluding elements from being output. | |
| 1 | 379 |
| 380 >>> ctxt = Context(foo=True, bar='Hello') | |
| 381 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 382 ... <b py:if="foo">${bar}</b> | |
| 383 ... </div>''') | |
| 384 >>> print tmpl.generate(ctxt) | |
| 385 <div> | |
| 386 <b>Hello</b> | |
| 387 </div> | |
| 388 """ | |
| 389 def __call__(self, stream, ctxt): | |
| 390 if self.expr.evaluate(ctxt): | |
| 391 return stream | |
| 392 return [] | |
| 393 | |
| 394 | |
| 395 class MatchDirective(Directive): | |
| 396 """Implementation of the `py:match` template directive. | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
397 |
| 1 | 398 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> |
|
17
ad63ad459524
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:
14
diff
changeset
|
399 ... <span py:match="greeting"> |
| 1 | 400 ... Hello ${select('@name')} |
| 401 ... </span> | |
| 402 ... <greeting name="Dude" /> | |
| 403 ... </div>''') | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
404 >>> print tmpl.generate() |
| 1 | 405 <div> |
| 406 <span> | |
| 407 Hello Dude | |
| 408 </span> | |
| 409 </div> | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
410 |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
411 A match template can produce the same kind of element that it matched |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
412 without entering an infinite recursion: |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
413 |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
414 >>> tmpl = Template('''<doc xmlns:py="http://purl.org/kid/ns#"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
415 ... <elem py:match="elem"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
416 ... <div class="elem">${select('*/text()')}</div> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
417 ... </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
418 ... <elem>Hey Joe</elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
419 ... </doc>''') |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
420 >>> print tmpl.generate() |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
421 <doc> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
422 <elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
423 <div class="elem">Hey Joe</div> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
424 </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
425 </doc> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
426 |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
427 Match directives are applied recursively, meaning that they are also |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
428 applied to any content they may have produced themselves: |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
429 |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
430 >>> tmpl = Template('''<doc xmlns:py="http://purl.org/kid/ns#"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
431 ... <elem py:match="elem"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
432 ... <div class="elem"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
433 ... ${select('*/*')} |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
434 ... </div> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
435 ... </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
436 ... <elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
437 ... <subelem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
438 ... <elem/> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
439 ... </subelem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
440 ... </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
441 ... </doc>''') |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
442 >>> print tmpl.generate() |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
443 <doc> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
444 <elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
445 <div class="elem"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
446 <subelem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
447 <elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
448 <div class="elem"> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
449 </div> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
450 </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
451 </subelem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
452 </div> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
453 </elem> |
|
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
454 </doc> |
| 1 | 455 """ |
| 456 __slots__ = ['path', 'stream'] | |
| 457 | |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
458 def __init__(self, value): |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
459 Directive.__init__(self, None) |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
460 self.path = Path(value) |
| 1 | 461 self.stream = [] |
| 462 | |
| 463 def __call__(self, stream, ctxt): | |
| 464 self.stream = list(stream) | |
|
17
ad63ad459524
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:
14
diff
changeset
|
465 ctxt._match_templates.append((self.path.test(), self.path, self.stream)) |
| 1 | 466 return [] |
| 467 | |
| 468 def __repr__(self): | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
469 return '<%s "%s">' % (self.__class__.__name__, self.path.source) |
| 1 | 470 |
| 471 | |
| 472 class ReplaceDirective(Directive): | |
| 473 """Implementation of the `py:replace` template directive. | |
| 474 | |
| 31 | 475 This directive replaces the element with the result of evaluating the |
| 476 value of the `py:replace` attribute: | |
| 477 | |
| 1 | 478 >>> ctxt = Context(bar='Bye') |
| 479 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 480 ... <span py:replace="bar">Hello</span> | |
| 481 ... </div>''') | |
| 482 >>> print tmpl.generate(ctxt) | |
| 483 <div> | |
| 484 Bye | |
| 485 </div> | |
| 486 | |
| 487 This directive is equivalent to `py:content` combined with `py:strip`, | |
| 488 providing a less verbose way to achieve the same effect: | |
| 489 | |
| 490 >>> ctxt = Context(bar='Bye') | |
| 491 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 492 ... <span py:content="bar" py:strip="">Hello</span> | |
| 493 ... </div>''') | |
| 494 >>> print tmpl.generate(ctxt) | |
| 495 <div> | |
| 496 Bye | |
| 497 </div> | |
| 498 """ | |
| 499 def __call__(self, stream, ctxt): | |
| 500 kind, data, pos = stream.next() | |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
501 yield Template.EXPR, self.expr, pos |
| 1 | 502 |
| 503 | |
| 504 class StripDirective(Directive): | |
| 505 """Implementation of the `py:strip` template directive. | |
| 506 | |
| 507 When the value of the `py:strip` attribute evaluates to `True`, the element | |
| 508 is stripped from the output | |
| 509 | |
| 510 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 511 ... <div py:strip="True"><b>foo</b></div> | |
| 512 ... </div>''') | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
513 >>> print tmpl.generate() |
| 1 | 514 <div> |
| 515 <b>foo</b> | |
| 516 </div> | |
| 517 | |
| 518 On the other hand, when the attribute evaluates to `False`, the element is | |
| 519 not stripped: | |
| 520 | |
| 521 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 522 ... <div py:strip="False"><b>foo</b></div> | |
| 523 ... </div>''') | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
524 >>> print tmpl.generate() |
| 1 | 525 <div> |
| 526 <div><b>foo</b></div> | |
| 527 </div> | |
| 528 | |
| 529 Leaving the attribute value empty is equivalent to a truth value: | |
| 530 | |
| 531 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 532 ... <div py:strip=""><b>foo</b></div> | |
| 533 ... </div>''') | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
534 >>> print tmpl.generate() |
| 1 | 535 <div> |
| 536 <b>foo</b> | |
| 537 </div> | |
| 538 | |
| 539 This directive is particulary interesting for named template functions or | |
| 540 match templates that do not generate a top-level element: | |
| 541 | |
| 542 >>> tmpl = Template('''<div xmlns:py="http://purl.org/kid/ns#"> | |
| 543 ... <div py:def="echo(what)" py:strip=""> | |
| 544 ... <b>${what}</b> | |
| 545 ... </div> | |
| 546 ... ${echo('foo')} | |
| 547 ... </div>''') | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
548 >>> print tmpl.generate() |
| 1 | 549 <div> |
| 550 <b>foo</b> | |
| 551 </div> | |
| 552 """ | |
| 553 def __call__(self, stream, ctxt): | |
| 554 if self.expr: | |
| 555 strip = self.expr.evaluate(ctxt) | |
| 556 else: | |
| 557 strip = True | |
| 558 if strip: | |
| 559 stream.next() # skip start tag | |
| 560 previous = stream.next() | |
| 561 for event in stream: | |
| 562 yield previous | |
| 563 previous = event | |
| 564 else: | |
| 565 for event in stream: | |
| 566 yield event | |
| 567 | |
| 568 | |
| 569 class Template(object): | |
| 570 """Can parse a template and transform it into the corresponding output | |
| 571 based on context data. | |
| 572 """ | |
|
18
4cbebb15a834
Actually make use of the `markup.core.Namespace` class, and add a couple of doctests.
cmlenz
parents:
17
diff
changeset
|
573 NAMESPACE = Namespace('http://purl.org/kid/ns#') |
| 1 | 574 |
|
17
ad63ad459524
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:
14
diff
changeset
|
575 EXPR = StreamEventKind('EXPR') # an expression |
|
ad63ad459524
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:
14
diff
changeset
|
576 SUB = StreamEventKind('SUB') # a "subprogram" |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
577 |
| 1 | 578 directives = [('def', DefDirective), |
| 579 ('match', MatchDirective), | |
| 580 ('for', ForDirective), | |
| 581 ('if', IfDirective), | |
| 582 ('replace', ReplaceDirective), | |
| 583 ('content', ContentDirective), | |
| 584 ('attrs', AttrsDirective), | |
| 585 ('strip', StripDirective)] | |
| 586 _dir_by_name = dict(directives) | |
| 587 _dir_order = [directive[1] for directive in directives] | |
| 588 | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
589 def __init__(self, source, basedir=None, filename=None): |
| 1 | 590 """Initialize a template from either a string or a file-like object.""" |
| 591 if isinstance(source, basestring): | |
| 592 self.source = StringIO(source) | |
| 593 else: | |
| 594 self.source = source | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
595 self.basedir = basedir |
| 1 | 596 self.filename = filename or '<string>' |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
597 if basedir and filename: |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
598 self.filepath = os.path.join(basedir, filename) |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
599 else: |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
600 self.filepath = '<string>' |
| 1 | 601 |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
602 self.filters = [] |
| 1 | 603 self.parse() |
| 604 | |
| 605 def __repr__(self): | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
606 return '<%s "%s">' % (self.__class__.__name__, self.filename) |
| 1 | 607 |
| 608 def parse(self): | |
| 609 """Parse the template. | |
| 610 | |
| 611 The parsing stage parses the XML template and constructs a list of | |
| 612 directives that will be executed in the render stage. The input is | |
| 613 split up into literal output (markup that does not depend on the | |
| 614 context data) and actual directives (commands or variable | |
| 615 substitution). | |
| 616 """ | |
| 617 stream = [] # list of events of the "compiled" template | |
| 618 dirmap = {} # temporary mapping of directives to elements | |
| 619 ns_prefix = {} | |
| 620 depth = 0 | |
| 621 | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
622 for kind, data, pos in XMLParser(self.source, filename=self.filename): |
| 1 | 623 |
| 624 if kind is Stream.START_NS: | |
| 625 # Strip out the namespace declaration for template directives | |
| 626 prefix, uri = data | |
| 627 if uri == self.NAMESPACE: | |
| 628 ns_prefix[prefix] = uri | |
| 629 else: | |
| 630 stream.append((kind, data, pos)) | |
| 631 | |
| 632 elif kind is Stream.END_NS: | |
| 633 if data in ns_prefix: | |
| 634 del ns_prefix[data] | |
| 635 else: | |
| 636 stream.append((kind, data, pos)) | |
| 637 | |
| 638 elif kind is Stream.START: | |
| 639 # Record any directive attributes in start tags | |
| 640 tag, attrib = data | |
| 641 directives = [] | |
| 642 new_attrib = [] | |
| 643 for name, value in attrib: | |
|
18
4cbebb15a834
Actually make use of the `markup.core.Namespace` class, and add a couple of doctests.
cmlenz
parents:
17
diff
changeset
|
644 if name in self.NAMESPACE: |
| 1 | 645 cls = self._dir_by_name.get(name.localname) |
| 646 if cls is None: | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
647 raise BadDirectiveError(name, self.filename, pos[1]) |
| 1 | 648 else: |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
649 directives.append(cls(value)) |
| 1 | 650 else: |
| 651 value = list(self._interpolate(value, *pos)) | |
| 652 new_attrib.append((name, value)) | |
| 653 if directives: | |
| 31 | 654 directives.sort(lambda a, b: cmp(self._dir_order.index(b.__class__), |
| 655 self._dir_order.index(a.__class__))) | |
| 1 | 656 dirmap[(depth, tag)] = (directives, len(stream)) |
| 657 | |
| 658 stream.append((kind, (tag, Attributes(new_attrib)), pos)) | |
| 659 depth += 1 | |
| 660 | |
| 661 elif kind is Stream.END: | |
| 662 depth -= 1 | |
| 663 stream.append((kind, data, pos)) | |
| 664 | |
| 665 # If there have have directive attributes with the corresponding | |
| 666 # start tag, move the events inbetween into a "subprogram" | |
| 667 if (depth, data) in dirmap: | |
| 668 directives, start_offset = dirmap.pop((depth, data)) | |
| 669 substream = stream[start_offset:] | |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
670 stream[start_offset:] = [(Template.SUB, |
| 1 | 671 (directives, substream), pos)] |
| 672 | |
| 673 elif kind is Stream.TEXT: | |
| 674 for kind, data, pos in self._interpolate(data, *pos): | |
| 675 stream.append((kind, data, pos)) | |
| 676 | |
| 677 else: | |
| 678 stream.append((kind, data, pos)) | |
| 679 | |
| 680 self.stream = stream | |
| 681 | |
| 682 _FULL_EXPR_RE = re.compile(r'(?<!\$)\$\{(.+?)\}') | |
| 683 _SHORT_EXPR_RE = re.compile(r'(?<!\$)\$([a-zA-Z][a-zA-Z0-9_\.]*)') | |
| 684 | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
685 def _interpolate(cls, text, filename=None, lineno=-1, offset=-1): |
| 1 | 686 """Parse the given string and extract expressions. |
| 687 | |
| 688 This method returns a list containing both literal text and `Expression` | |
| 689 objects. | |
|
14
76b5d4b189e6
The `<py:match>` directive now protects itself against simple infinite recursion (see MatchDirective), while still allowing recursion in general.
cmlenz
parents:
13
diff
changeset
|
690 |
| 1 | 691 @param text: the text to parse |
| 692 @param lineno: the line number at which the text was found (optional) | |
| 693 @param offset: the column number at which the text starts in the source | |
| 694 (optional) | |
| 695 """ | |
|
17
ad63ad459524
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:
14
diff
changeset
|
696 patterns = [Template._FULL_EXPR_RE, Template._SHORT_EXPR_RE] |
| 1 | 697 def _interpolate(text): |
| 698 for idx, group in enumerate(patterns.pop(0).split(text)): | |
| 699 if idx % 2: | |
|
10
c5890ef863ba
Moved the template-specific stream event kinds into the template module.
cmlenz
parents:
6
diff
changeset
|
700 yield Template.EXPR, Expression(group), (lineno, offset) |
| 1 | 701 elif group: |
| 702 if patterns: | |
| 703 for result in _interpolate(group): | |
| 704 yield result | |
| 705 else: | |
| 706 yield Stream.TEXT, group.replace('$$', '$'), \ | |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
707 (filename, lineno, offset) |
| 1 | 708 return _interpolate(text) |
| 709 _interpolate = classmethod(_interpolate) | |
| 710 | |
|
17
ad63ad459524
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:
14
diff
changeset
|
711 def generate(self, ctxt=None): |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
712 """Apply the template to the given context data. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
713 |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
714 @param ctxt: a `Context` instance containing the data for the template |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
715 @return: a markup event stream representing the result of applying |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
716 the template to the context data. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
717 """ |
|
17
ad63ad459524
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:
14
diff
changeset
|
718 if ctxt is None: |
|
ad63ad459524
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:
14
diff
changeset
|
719 ctxt = Context() |
|
ad63ad459524
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:
14
diff
changeset
|
720 if not hasattr(ctxt, '_match_templates'): |
|
ad63ad459524
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:
14
diff
changeset
|
721 ctxt._match_templates = [] |
|
ad63ad459524
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:
14
diff
changeset
|
722 |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
723 stream = self._match(self._eval(self.stream, ctxt), ctxt) |
|
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
724 return Stream(self._flatten(stream, ctxt)) |
|
17
ad63ad459524
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:
14
diff
changeset
|
725 |
|
ad63ad459524
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:
14
diff
changeset
|
726 def _eval(self, stream, ctxt=None): |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
727 """Internal stream filter that evaluates any expressions in `START` and |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
728 `TEXT` events. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
729 """ |
|
17
ad63ad459524
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:
14
diff
changeset
|
730 for kind, data, pos in stream: |
|
ad63ad459524
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:
14
diff
changeset
|
731 |
|
ad63ad459524
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:
14
diff
changeset
|
732 if kind is Stream.START: |
|
ad63ad459524
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:
14
diff
changeset
|
733 # Attributes may still contain expressions in start tags at |
|
ad63ad459524
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:
14
diff
changeset
|
734 # this point, so do some evaluation |
|
ad63ad459524
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:
14
diff
changeset
|
735 tag, attrib = data |
|
ad63ad459524
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:
14
diff
changeset
|
736 new_attrib = [] |
|
ad63ad459524
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:
14
diff
changeset
|
737 for name, substream in attrib: |
|
ad63ad459524
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:
14
diff
changeset
|
738 if isinstance(substream, basestring): |
|
ad63ad459524
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:
14
diff
changeset
|
739 value = substream |
|
ad63ad459524
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:
14
diff
changeset
|
740 else: |
|
ad63ad459524
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:
14
diff
changeset
|
741 values = [] |
|
ad63ad459524
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:
14
diff
changeset
|
742 for subkind, subdata, subpos in substream: |
|
ad63ad459524
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:
14
diff
changeset
|
743 if subkind is Template.EXPR: |
|
ad63ad459524
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:
14
diff
changeset
|
744 values.append(subdata.evaluate(ctxt)) |
|
ad63ad459524
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:
14
diff
changeset
|
745 else: |
|
ad63ad459524
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:
14
diff
changeset
|
746 values.append(subdata) |
|
ad63ad459524
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:
14
diff
changeset
|
747 value = filter(lambda x: x is not None, values) |
|
ad63ad459524
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:
14
diff
changeset
|
748 if not value: |
|
ad63ad459524
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:
14
diff
changeset
|
749 continue |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
750 new_attrib.append((name, u''.join(value))) |
|
17
ad63ad459524
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:
14
diff
changeset
|
751 yield kind, (tag, Attributes(new_attrib)), pos |
|
ad63ad459524
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:
14
diff
changeset
|
752 |
|
ad63ad459524
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:
14
diff
changeset
|
753 elif kind is Template.EXPR: |
|
ad63ad459524
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:
14
diff
changeset
|
754 result = data.evaluate(ctxt) |
|
ad63ad459524
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:
14
diff
changeset
|
755 if result is None: |
|
ad63ad459524
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:
14
diff
changeset
|
756 continue |
|
ad63ad459524
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:
14
diff
changeset
|
757 |
|
ad63ad459524
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:
14
diff
changeset
|
758 # First check for a string, otherwise the iterable test below |
|
ad63ad459524
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:
14
diff
changeset
|
759 # succeeds, and the string will be chopped up into individual |
|
ad63ad459524
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:
14
diff
changeset
|
760 # characters |
|
ad63ad459524
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:
14
diff
changeset
|
761 if isinstance(result, basestring): |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
762 yield Stream.TEXT, unicode(result), pos |
|
17
ad63ad459524
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:
14
diff
changeset
|
763 else: |
|
ad63ad459524
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:
14
diff
changeset
|
764 # Test if the expression evaluated to an iterable, in which |
|
ad63ad459524
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:
14
diff
changeset
|
765 # case we yield the individual items |
|
ad63ad459524
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:
14
diff
changeset
|
766 try: |
|
ad63ad459524
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:
14
diff
changeset
|
767 yield (Template.SUB, ([], iter(result)), pos) |
|
ad63ad459524
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:
14
diff
changeset
|
768 except TypeError: |
|
ad63ad459524
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:
14
diff
changeset
|
769 # Neither a string nor an iterable, so just pass it |
|
ad63ad459524
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:
14
diff
changeset
|
770 # through |
|
ad63ad459524
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:
14
diff
changeset
|
771 yield Stream.TEXT, unicode(result), pos |
|
ad63ad459524
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:
14
diff
changeset
|
772 |
|
ad63ad459524
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:
14
diff
changeset
|
773 else: |
|
ad63ad459524
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:
14
diff
changeset
|
774 yield kind, data, pos |
|
ad63ad459524
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:
14
diff
changeset
|
775 |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
776 def _flatten(self, stream, ctxt=None): |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
777 """Internal stream filter that expands `SUB` events in the stream.""" |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
778 for filter_ in self.filters: |
|
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
779 stream = filter_(iter(stream), ctxt) |
|
17
ad63ad459524
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:
14
diff
changeset
|
780 try: |
|
ad63ad459524
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:
14
diff
changeset
|
781 for kind, data, pos in stream: |
|
ad63ad459524
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:
14
diff
changeset
|
782 if kind is Template.SUB: |
|
ad63ad459524
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:
14
diff
changeset
|
783 # This event is a list of directives and a list of |
|
ad63ad459524
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:
14
diff
changeset
|
784 # nested events to which those directives should be |
|
ad63ad459524
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:
14
diff
changeset
|
785 # applied |
|
ad63ad459524
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:
14
diff
changeset
|
786 directives, substream = data |
|
ad63ad459524
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:
14
diff
changeset
|
787 for directive in directives: |
|
ad63ad459524
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:
14
diff
changeset
|
788 substream = directive(iter(substream), ctxt) |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
789 substream = self._match(self._eval(substream, ctxt), ctxt) |
|
17
ad63ad459524
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:
14
diff
changeset
|
790 for event in self._flatten(substream, ctxt): |
|
ad63ad459524
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:
14
diff
changeset
|
791 yield event |
|
ad63ad459524
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:
14
diff
changeset
|
792 continue |
|
ad63ad459524
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:
14
diff
changeset
|
793 else: |
|
ad63ad459524
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:
14
diff
changeset
|
794 yield kind, data, pos |
|
ad63ad459524
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:
14
diff
changeset
|
795 except SyntaxError, err: |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
796 raise TemplateSyntaxError(err, self.filename, pos[1], |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
797 pos[2] + (err.offset or 0)) |
|
17
ad63ad459524
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:
14
diff
changeset
|
798 |
|
ad63ad459524
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:
14
diff
changeset
|
799 def _match(self, stream, ctxt=None): |
|
29
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
800 """Internal stream filter that applies any defined match templates |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
801 to the stream. |
|
4b6cee37ce62
* Minor simplification of template directives: they no longer get passed the template instance and the position, as no directive was actually using
cmlenz
parents:
27
diff
changeset
|
802 """ |
|
17
ad63ad459524
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:
14
diff
changeset
|
803 for kind, data, pos in stream: |
|
ad63ad459524
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:
14
diff
changeset
|
804 |
|
ad63ad459524
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:
14
diff
changeset
|
805 # We (currently) only care about start and end events for matching |
|
ad63ad459524
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:
14
diff
changeset
|
806 # We might care about namespace events in the future, though |
|
ad63ad459524
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:
14
diff
changeset
|
807 if kind not in (Stream.START, Stream.END): |
|
ad63ad459524
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:
14
diff
changeset
|
808 yield kind, data, pos |
|
ad63ad459524
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:
14
diff
changeset
|
809 continue |
|
ad63ad459524
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:
14
diff
changeset
|
810 |
|
ad63ad459524
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:
14
diff
changeset
|
811 for idx, (test, path, template) in enumerate(ctxt._match_templates): |
|
ad63ad459524
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:
14
diff
changeset
|
812 if (kind, data, pos) in template[::len(template)]: |
|
ad63ad459524
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:
14
diff
changeset
|
813 # This is the event this match template produced itself, so |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
814 # matching it again would result in an infinite loop |
|
17
ad63ad459524
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:
14
diff
changeset
|
815 continue |
|
ad63ad459524
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:
14
diff
changeset
|
816 |
|
ad63ad459524
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:
14
diff
changeset
|
817 result = test(kind, data, pos) |
|
ad63ad459524
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:
14
diff
changeset
|
818 |
|
ad63ad459524
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:
14
diff
changeset
|
819 if result: |
|
ad63ad459524
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:
14
diff
changeset
|
820 # Consume and store all events until an end event |
|
ad63ad459524
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:
14
diff
changeset
|
821 # corresponding to this start event is encountered |
|
ad63ad459524
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:
14
diff
changeset
|
822 content = [(kind, data, pos)] |
|
ad63ad459524
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:
14
diff
changeset
|
823 depth = 1 |
|
ad63ad459524
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:
14
diff
changeset
|
824 while depth > 0: |
|
ad63ad459524
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:
14
diff
changeset
|
825 event = stream.next() |
|
ad63ad459524
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:
14
diff
changeset
|
826 if event[0] is Stream.START: |
|
ad63ad459524
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:
14
diff
changeset
|
827 depth += 1 |
|
ad63ad459524
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:
14
diff
changeset
|
828 elif event[0] is Stream.END: |
|
ad63ad459524
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:
14
diff
changeset
|
829 depth -= 1 |
|
ad63ad459524
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:
14
diff
changeset
|
830 content.append(event) |
|
ad63ad459524
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:
14
diff
changeset
|
831 |
|
ad63ad459524
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:
14
diff
changeset
|
832 # enable the path to keep track of the stream state |
|
ad63ad459524
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:
14
diff
changeset
|
833 test(*event) |
|
ad63ad459524
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:
14
diff
changeset
|
834 |
|
23
00835401c8cc
Separate match and eval filters from the include and user-supplied filters.
cmlenz
parents:
22
diff
changeset
|
835 content = list(self._flatten(content, ctxt)) |
|
17
ad63ad459524
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:
14
diff
changeset
|
836 |
|
ad63ad459524
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:
14
diff
changeset
|
837 def _apply(stream, ctxt): |
|
ad63ad459524
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:
14
diff
changeset
|
838 ctxt.push(select=lambda path: Stream(stream).select(path)) |
|
ad63ad459524
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:
14
diff
changeset
|
839 for event in template: |
|
ad63ad459524
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:
14
diff
changeset
|
840 yield event |
|
ad63ad459524
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:
14
diff
changeset
|
841 ctxt.pop() |
|
ad63ad459524
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:
14
diff
changeset
|
842 |
|
ad63ad459524
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:
14
diff
changeset
|
843 yield (Template.SUB, |
|
ad63ad459524
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:
14
diff
changeset
|
844 ([lambda stream, ctxt: _apply(content, ctxt)], |
|
ad63ad459524
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:
14
diff
changeset
|
845 []), content[0][-1]) |
|
ad63ad459524
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:
14
diff
changeset
|
846 break |
|
ad63ad459524
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:
14
diff
changeset
|
847 else: |
|
ad63ad459524
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:
14
diff
changeset
|
848 yield kind, data, pos |
|
ad63ad459524
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:
14
diff
changeset
|
849 |
| 1 | 850 |
| 851 class TemplateLoader(object): | |
| 852 """Responsible for loading templates from files on the specified search | |
| 853 path. | |
| 854 | |
| 855 >>> import tempfile | |
| 856 >>> fd, path = tempfile.mkstemp(suffix='.html', prefix='template') | |
| 857 >>> os.write(fd, '<p>$var</p>') | |
| 858 11 | |
| 859 >>> os.close(fd) | |
| 860 | |
| 861 The template loader accepts a list of directory paths that are then used | |
| 862 when searching for template files, in the given order: | |
| 863 | |
| 864 >>> loader = TemplateLoader([os.path.dirname(path)]) | |
| 865 | |
| 866 The `load()` method first checks the template cache whether the requested | |
| 867 template has already been loaded. If not, it attempts to locate the | |
| 868 template file, and returns the corresponding `Template` object: | |
| 869 | |
| 870 >>> template = loader.load(os.path.basename(path)) | |
| 871 >>> isinstance(template, Template) | |
| 872 True | |
| 873 | |
| 874 Template instances are cached: requesting a template with the same name | |
| 875 results in the same instance being returned: | |
| 876 | |
| 877 >>> loader.load(os.path.basename(path)) is template | |
| 878 True | |
| 879 """ | |
| 880 def __init__(self, search_path=None, auto_reload=False): | |
| 881 """Create the template laoder. | |
| 882 | |
| 883 @param search_path: a list of absolute path names that should be | |
| 884 searched for template files | |
| 885 @param auto_reload: whether to check the last modification time of | |
| 886 template files, and reload them if they have changed | |
| 887 """ | |
| 888 self.search_path = search_path | |
| 889 if self.search_path is None: | |
| 890 self.search_path = [] | |
| 891 self.auto_reload = auto_reload | |
| 892 self._cache = {} | |
| 893 self._mtime = {} | |
| 894 | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
895 def load(self, filename, relative_to=None): |
| 1 | 896 """Load the template with the given name. |
| 897 | |
|
22
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
898 If the `filename` parameter is relative, this method searches the search |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
899 path trying to locate a template matching the given name. If the file |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
900 name is an absolute path, the search path is not bypassed. |
| 1 | 901 |
|
22
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
902 If requested template is not found, a `TemplateNotFound` exception is |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
903 raised. Otherwise, a `Template` object is returned that represents the |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
904 parsed template. |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
905 |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
906 Template instances are cached to avoid having to parse the same |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
907 template file more than once. Thus, subsequent calls of this method |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
908 with the same template file name will return the same `Template` |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
909 object (unless the `auto_reload` option is enabled and the file was |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
910 changed since the last parse.) |
| 1 | 911 |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
912 If the `relative_to` parameter is provided, the `filename` is |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
913 interpreted as being relative to that path. |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
914 |
| 1 | 915 @param filename: the relative path of the template file to load |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
916 @param relative_to: the filename of the template from which the new |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
917 template is being loaded, or `None` if the template is being loaded |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
918 directly |
| 1 | 919 """ |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
920 if relative_to: |
|
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
921 filename = posixpath.join(posixpath.dirname(relative_to), filename) |
| 1 | 922 filename = os.path.normpath(filename) |
|
22
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
923 |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
924 # First check the cache to avoid reparsing the same file |
| 1 | 925 try: |
| 926 tmpl = self._cache[filename] | |
| 927 if not self.auto_reload or \ | |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
928 os.path.getmtime(tmpl.filepath) == self._mtime[filename]: |
| 1 | 929 return tmpl |
| 930 except KeyError: | |
| 931 pass | |
|
22
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
932 |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
933 # Bypass the search path if the filename is absolute |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
934 search_path = self.search_path |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
935 if os.path.isabs(filename): |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
936 search_path = [os.path.dirname(filename)] |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
937 |
|
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
938 for dirname in search_path: |
| 1 | 939 filepath = os.path.join(dirname, filename) |
| 940 try: | |
| 941 fileobj = file(filepath, 'rt') | |
| 942 try: | |
|
22
31b13ddf9f53
Fix for the template engine plugin: the search path is now ignored if the requested template path is absolute.
cmlenz
parents:
21
diff
changeset
|
943 from markup.filters import IncludeFilter |
|
21
eca77129518a
* Include paths are now interpreted relative to the path of the including template. Closes #3.
cmlenz
parents:
18
diff
changeset
|
944 tmpl = Template(fileobj, basedir=dirname, filename=filename) |
|
17
ad63ad459524
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:
14
diff
changeset
|
945 tmpl.filters.append(IncludeFilter(self)) |
| 1 | 946 finally: |
| 947 fileobj.close() | |
| 948 self._cache[filename] = tmpl | |
| 949 self._mtime[filename] = os.path.getmtime(filepath) | |
| 950 return tmpl | |
| 951 except IOError: | |
| 952 continue | |
| 953 raise TemplateNotFound(filename, self.search_path) |