piecrust2: piecrust/templating/jinjaengine.py annotate

annotate piecrust/templating/jinjaengine.py @ 184:27d623a241c6

render: Don't always use a `.html` extension for layouts. The rendering code now only looks for the extensions explicitely specified by the template engine. To compensate, the Jinja engine specifies `.html` as its last supported extension.

author	Ludovic Chabant <ludovic@chabant.com>
date	Sun, 04 Jan 2015 14:58:40 -0800
parents	28444014ce7d
children	1163bd034dc5

rev	line source
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1 import re
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	2 import time
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	3 import os.path
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	4 import logging
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	5 import threading
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	6 import strict_rfc3339
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	7 from jinja2 import Environment, FileSystemLoader, TemplateNotFound
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	8 from jinja2.exceptions import TemplateSyntaxError
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	9 from jinja2.ext import Extension, Markup
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	10 from jinja2.lexer import Token, describe_token
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	11 from jinja2.nodes import CallBlock, Const
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	12 from compressinja.html import HtmlCompressor, StreamProcessContext
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	13 from pygments import highlight
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	14 from pygments.formatters import HtmlFormatter
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	15 from pygments.lexers import get_lexer_by_name, guess_lexer
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	16 from piecrust.data.paginator import Paginator
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	17 from piecrust.rendering import format_text
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	18 from piecrust.routing import CompositeRouteFunction
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	19 from piecrust.templating.base import (TemplateEngine, TemplateNotFoundError,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	20 TemplatingError)
48 002fa58f54dc Give the proper URL to `Paginator` in the `paginate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	21 from piecrust.uriutil import multi_replace, get_first_sub_uri
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	22
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	23
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	24 logger = logging.getLogger(__name__)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	25
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	26
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	27 class JinjaTemplateEngine(TemplateEngine):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	28 # Name `twig` is for backwards compatibility with PieCrust 1.x.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	29 ENGINE_NAMES = ['jinja', 'jinja2', 'twig']
184 27d623a241c6 render: Don't always use a `.html` extension for layouts. Ludovic Chabant <ludovic@chabant.com> parents: 128 diff changeset	30 EXTENSIONS = ['jinja', 'jinja2', 'twig', 'html']
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	31
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	32 def __init__(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	33 self.env = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	34
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	35 def renderString(self, txt, data, filename=None):
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	36 self._ensureLoaded()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	37
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	38 try:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	39 tpl = self.env.from_string(txt)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	40 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	41 raise self._getTemplatingError(tse, filename=filename)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	42 except TemplateNotFound:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	43 raise TemplateNotFoundError()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	44
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	45 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	46 return tpl.render(data)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	47 except TemplateSyntaxError as tse:
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	48 raise self._getTemplatingError(tse)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	49
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	50 def renderFile(self, paths, data):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	51 self._ensureLoaded()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	52 tpl = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	53 logger.debug("Looking for template: %s" % paths)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	54 for p in paths:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	55 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	56 tpl = self.env.get_template(p)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	57 break
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	58 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	59 raise self._getTemplatingError(tse)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	60 except TemplateNotFound:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	61 pass
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	62
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	63 if tpl is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64 raise TemplateNotFoundError()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	65
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	66 try:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	67 return tpl.render(data)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	68 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	69 raise self._getTemplatingError(tse)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	70
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	71 def _getTemplatingError(self, tse, filename=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	72 filename = tse.filename or filename
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	73 if filename and os.path.isabs(filename):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	74 filename = os.path.relpath(filename, self.env.app.root_dir)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	75 err = TemplatingError(str(tse), filename, tse.lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	76 raise err from tse
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	77
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	78 def _ensureLoaded(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	79 if self.env:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	80 return
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	81
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	82 autoescape = self.app.config.get('jinja/auto_escape')
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	83 if autoescape is None:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	84 autoescape = self.app.config.get('twig/auto_escape')
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	85 if autoescape is None:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	86 autoescape = True
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	87
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	88 logger.debug("Creating Jinja environment with folders: %s" %
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	89 self.app.templates_dirs)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	90 loader = FileSystemLoader(self.app.templates_dirs)
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	91 extensions = [
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	92 PieCrustHighlightExtension,
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	93 PieCrustCacheExtension,
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	94 PieCrustSpacelessExtension]
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	95 twig_compatibility_mode = self.app.config.get('jinja/twig_compatibility')
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	96 if twig_compatibility_mode is None or twig_compatibility_mode is True:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	97 extensions.append(PieCrustFormatExtension)
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	98 if autoescape:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	99 extensions.append('jinja2.ext.autoescape')
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	100 self.env = PieCrustEnvironment(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	101 self.app,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	102 loader=loader,
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	103 extensions=extensions)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	104
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	105
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	106 class PieCrustEnvironment(Environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	107 def __init__(self, app, args, *kwargs):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	108 super(PieCrustEnvironment, self).__init__(args, *kwargs)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	109 self.app = app
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	110 self.auto_reload = True
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	111 self.globals.update({
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	112 'fail': raise_exception})
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	113 self.filters.update({
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	114 'keys': get_dict_keys,
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	115 'values': get_dict_values,
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	116 'paginate': self._paginate,
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	117 'formatwith': self._formatWith,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	118 'markdown': lambda v: self._formatWith(v, 'markdown'),
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	119 'textile': lambda v: self._formatWith(v, 'textile'),
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	120 'nocache': add_no_cache_parameter,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	121 'wordcount': get_word_count,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	122 'stripoutertag': strip_outer_tag,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	123 'stripslash': strip_slash,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	124 'titlecase': title_case,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	125 'atomdate': get_atom_date,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	126 'date': get_date})
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	127 # Backwards compatibility with PieCrust 1.x.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	128 self.globals.update({
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	129 'pcfail': raise_exception})
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	130
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	131 # Backwards compatibility with Twig.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	132 twig_compatibility_mode = app.config.get('jinja/twig_compatibility')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	133 if twig_compatibility_mode is None or twig_compatibility_mode is True:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	134 self.trim_blocks = True
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	135 self.filters['raw'] = self.filters['safe']
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	136
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	137 # Add route functions.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	138 for route in app.routes:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	139 name = route.template_func_name
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	140 func = self.globals.get(name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	141 if func is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	142 func = CompositeRouteFunction()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	143 func.addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	144 self.globals[name] = func
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	145 elif isinstance(func, CompositeRouteFunction):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	146 self.globals[name].addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	147 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	148 raise Exception("Route function '%s' collides with an "
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	149 "existing function or template data." %
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	150 name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	151
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	152 def _paginate(self, value, items_per_page=5):
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	153 cpi = self.app.env.exec_info_stack.current_page_info
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	154 if cpi is None or cpi.page is None or cpi.render_ctx is None:
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	155 raise Exception("Can't paginate when no page has been pushed "
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	156 "on the execution stack.")
48 002fa58f54dc Give the proper URL to `Paginator` in the `paginate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	157 first_uri = get_first_sub_uri(self.app, cpi.render_ctx.uri)
002fa58f54dc Give the proper URL to `Paginator` in the `paginate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	158 return Paginator(cpi.page, value, first_uri,
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	159 page_num=cpi.render_ctx.page_num,
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	160 items_per_page=items_per_page)
dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	161
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	162 def _formatWith(self, value, format_name):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	163 return format_text(self.app, format_name, value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	164
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	165
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	166 def raise_exception(msg):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	167 raise Exception(msg)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	168
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	170 def get_dict_keys(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	171 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	172 return [i[0] for i in value]
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	173 return value.keys()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	174
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	175
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	176 def get_dict_values(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	177 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	178 return [i[1] for i in value]
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	179 return value.values()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	180
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	181
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	182 def add_no_cache_parameter(value, param_name='t', param_value=None):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	183 if not param_value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	184 param_value = time.time()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	185 if '?' in value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	186 value += '&'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	187 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	188 value += '?'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	189 value += '%s=%s' % (param_name, param_value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	190 return value
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	191
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	192
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	193 def get_word_count(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	194 return len(value.split())
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	195
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	196
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	197 def strip_outer_tag(value, tag=None):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	198 tag_pattern = '[a-z]+[a-z0-9]*'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	199 if tag is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	200 tag_pattern = re.escape(tag)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	201 pat = r'^\<' + tag_pattern + r'\>(.*)\</' + tag_pattern + '>$'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	202 m = re.match(pat, value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	203 if m:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	204 return m.group(1)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	205 return value
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	206
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	207
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	208 def strip_slash(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	209 return value.rstrip('/')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	210
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	211
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	212 def title_case(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	213 return value.title()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	214
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	215
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	216 def get_atom_date(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	217 return strict_rfc3339.timestamp_to_rfc3339_localoffset(int(value))
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	218
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	219
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	220 def get_date(value, fmt):
28 19f3ac27c3d5 The `date` filter now supports passing `"now"` as in Twig. Ludovic Chabant <ludovic@chabant.com> parents: 19 diff changeset	221 if value == 'now':
19f3ac27c3d5 The `date` filter now supports passing `"now"` as in Twig. Ludovic Chabant <ludovic@chabant.com> parents: 19 diff changeset	222 value = time.time()
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	223 if '%' not in fmt:
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	224 suggest = php_format_to_strftime_format(fmt)
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	225 raise Exception("PieCrust 1 date formats won't work in PieCrust 2. "
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	226 "You probably want a format that look like '%s'. "
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	227 "Please check the `strftime` formatting page here: "
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	228 "https://docs.python.org/3/library/datetime.html"
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	229 "#strftime-and-strptime-behavior" %
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	230 suggest)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	231 return time.strftime(fmt, time.localtime(value))
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	232
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	233
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	234 class PieCrustFormatExtension(Extension):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	235 tags = set(['pcformat'])
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	236
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	237 def __init__(self, environment):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	238 super(PieCrustFormatExtension, self).__init__(environment)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	239
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	240 def parse(self, parser):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	241 lineno = next(parser.stream).lineno
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	242 args = [parser.parse_expression()]
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	243 body = parser.parse_statements(['name:endpcformat'], drop_needle=True)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	244 return CallBlock(self.call_method('_format', args),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	245 [], [], body).set_lineno(lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	246
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	247 def _format(self, format_name, caller=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	248 body = caller()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	249 text = format_text(self.environment.app,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	250 format_name,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	251 Markup(body.rstrip()).unescape(),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	252 exact_format=True)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	253 return text
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	254
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	255
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	256 class PieCrustHighlightExtension(Extension):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	257 tags = set(['highlight', 'geshi'])
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	258
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	259 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	260 super(PieCrustHighlightExtension, self).__init__(environment)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	261
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	262 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	263 lineno = next(parser.stream).lineno
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	264
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	265 # Extract the language name.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	266 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	267
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	268 # Extract optional arguments.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	269 kwarg_names = {'line_numbers': 0, 'use_classes': 0, 'class': 1, 'id': 1}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	270 kwargs = {}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	271 while not parser.stream.current.test('block_end'):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	272 name = parser.stream.expect('name')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	273 if name.value not in kwarg_names:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	274 raise Exception("'%s' is not a valid argument for the code "
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	275 "highlighting tag." % name.value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	276 if kwarg_names[name.value] == 0:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	277 kwargs[name.value] = Const(True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	278 elif parser.stream.skip_if('assign'):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	279 kwargs[name.value] = parser.parse_expression()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	280
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	281 # body of the block
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	282 body = parser.parse_statements(['name:endhighlight', 'name:endgeshi'],
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	283 drop_needle=True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285 return CallBlock(self.call_method('_highlight', args, kwargs),
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	286 [], [], body).set_lineno(lineno)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	287
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	288 def _highlight(self, lang, line_numbers=False, use_classes=False,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	289 css_class=None, css_id=None, caller=None):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290 # Try to be mostly compatible with Jinja2-highlight's settings.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 body = caller()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	292
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	293 if lang is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	294 lexer = guess_lexer(body)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	295 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	296 lexer = get_lexer_by_name(lang, stripall=False)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	297
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	298 if css_class is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	299 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	300 css_class = self.environment.jinja2_highlight_cssclass
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	301 except AttributeError:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302 pass
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	303
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	304 if css_class is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	305 formatter = HtmlFormatter(cssclass=css_class,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	306 linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	307 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	308 formatter = HtmlFormatter(linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	309
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	310 code = highlight(Markup(body.rstrip()).unescape(), lexer, formatter)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	311 return code
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	312
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	313
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	314 class PieCrustCacheExtension(Extension):
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	315 tags = set(['pccache', 'cache'])
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	316
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	317 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	318 super(PieCrustCacheExtension, self).__init__(environment)
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	319 self._lock = threading.RLock()
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	320
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	321 environment.extend(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	322 piecrust_cache_prefix='',
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	323 piecrust_cache={}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	324 )
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	325
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	326 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	327 # the first token is the token that started the tag. In our case
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	328 # we only listen to ``'pccache'`` so this will be a name token with
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	329 # `pccache` as value. We get the line number so that we can give
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	330 # that line number to the nodes we create by hand.
7 343d08ef5668 More PieCrust 3 fixes, and a couple of miscellaneous bug fixes. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	331 lineno = next(parser.stream).lineno
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	332
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	333 # now we parse a single expression that is used as cache key.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	334 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	335
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	336 # now we parse the body of the cache block up to `endpccache` and
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	337 # drop the needle (which would always be `endpccache` in that case)
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	338 body = parser.parse_statements(['name:endpccache', 'name:endcache'],
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	339 drop_needle=True)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	340
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	341 # now return a `CallBlock` node that calls our _cache_support
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	342 # helper method on this extension.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	343 return CallBlock(self.call_method('_cache_support', args),
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	344 [], [], body).set_lineno(lineno)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	345
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	346 def _cache_support(self, name, caller):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	347 key = self.environment.piecrust_cache_prefix + name
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	348
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	349 exc_stack = self.environment.app.env.exec_info_stack
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	350 render_ctx = exc_stack.current_page_info.render_ctx
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	351
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	352 # try to load the block from the cache
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	353 # if there is no fragment in the cache, render it and store
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	354 # it in the cache.
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	355 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	356 if pair is not None:
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	357 render_ctx.used_source_names.update(pair[1])
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	358 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	359
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	360 with self._lock:
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	361 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	362 if pair is not None:
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	363 render_ctx.used_source_names.update(pair[1])
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	364 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	365
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	366 prev_used = render_ctx.used_source_names.copy()
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	367 rv = caller()
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	368 after_used = render_ctx.used_source_names.copy()
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	369 used_delta = after_used.difference(prev_used)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	370 self.environment.piecrust_cache[key] = (rv, used_delta)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	371 return rv
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	372
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	373
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	374 class PieCrustSpacelessExtension(HtmlCompressor):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	375 """ A re-implementation of `SelectiveHtmlCompressor` so that we can
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	376 both use `strip` or `spaceless` in templates.
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	377 """
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	378 def filter_stream(self, stream):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	379 ctx = StreamProcessContext(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	380 strip_depth = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	381 while 1:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	382 if stream.current.type == 'block_begin':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	383 for tk in ['strip', 'spaceless']:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	384 change = self._processToken(ctx, stream, tk)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	385 if change != 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	386 strip_depth += change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	387 if strip_depth < 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	388 ctx.fail('Unexpected tag end%s' % tk)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	389 break
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	390 if strip_depth > 0 and stream.current.type == 'data':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	391 ctx.token = stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	392 value = self.normalize(ctx)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	393 yield Token(stream.current.lineno, 'data', value)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	394 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	395 yield stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	396 next(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	397
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	398 def _processToken(self, ctx, stream, test_token):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	399 change = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	400 if (stream.look().test('name:%s' % test_token) or
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	401 stream.look().test('name:end%s' % test_token)):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	402 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	403 if stream.current.value == test_token:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	404 change = 1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	405 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	406 change = -1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	407 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	408 if stream.current.type != 'block_end':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	409 ctx.fail('expected end of block, got %s' %
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	410 describe_token(stream.current))
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	411 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	412 return change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	413
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	414
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	415 def php_format_to_strftime_format(fmt):
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	416 replacements = {
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	417 'd': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	418 'D': '%a',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	419 'j': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	420 'l': '%A',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	421 'w': '%w',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	422 'z': '%j',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	423 'W': '%W',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	424 'F': '%B',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	425 'm': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	426 'M': '%b',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	427 'n': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	428 'y': '%Y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	429 'Y': '%y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	430 'g': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	431 'G': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	432 'h': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	433 'H': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	434 'i': '%M',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	435 's': '%S',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	436 'e': '%Z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	437 'O': '%z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	438 'c': '%Y-%m-%dT%H:%M:%SZ'}
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	439 return multi_replace(fmt, replacements)
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	440

Mercurial > piecrust2

annotate piecrust/templating/jinjaengine.py @ 184:27d623a241c6