piecrust2: piecrust/templating/jinjaengine.py annotate

annotate piecrust/templating/jinjaengine.py @ 440:32c7c2d219d2

performance: Refactor how data is managed to reduce copying. * Make use of `collections.abc.Mapping` to better identify things that are supposed to look like dictionaries. * Instead of handling "overlay" of data in a dict tree in each different data object, make all objects `Mapping`s and handle merging at a higher level with the new `MergedMapping` object. * Since this new object is read-only, remove the need for deep-copying of app and page configurations. * Split data classes into separate modules.

author	Ludovic Chabant <ludovic@chabant.com>
date	Sun, 28 Jun 2015 08:22:39 -0700
parents	9e25852f058b
children	d8d86debea81

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
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	6 import email.utils
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	7 import strict_rfc3339
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	8 from jinja2 import Environment, FileSystemLoader, TemplateNotFound
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	9 from jinja2.exceptions import TemplateSyntaxError
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	10 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	11 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	12 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	13 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	14 from pygments import highlight
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	15 from pygments.formatters import HtmlFormatter
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	16 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	17 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	18 from piecrust.rendering import format_text
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	19 from piecrust.routing import CompositeRouteFunction
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	20 from piecrust.templating.base import (TemplateEngine, TemplateNotFoundError,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	21 TemplatingError)
298 b7ab1b503510 data: Fix incorrect next/previous page URLs in pagination data. Ludovic Chabant <ludovic@chabant.com> parents: 293 diff changeset	22 from piecrust.uriutil import multi_replace, split_sub_uri
3 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
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	25 logger = logging.getLogger(__name__)
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
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	28 class JinjaTemplateEngine(TemplateEngine):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	29 # 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	30 ENGINE_NAMES = ['jinja', 'jinja2', 'twig']
395 9e25852f058b jinja: Look for `html` extension first instead of last. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	31 EXTENSIONS = ['html', 'jinja', 'jinja2', 'twig']
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	32
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	33 def __init__(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	34 self.env = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	35
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	36 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	37 self._ensureLoaded()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	38
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	39 try:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	40 tpl = self.env.from_string(txt)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	41 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	42 raise self._getTemplatingError(tse, filename=filename)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	43 except TemplateNotFound:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	44 raise TemplateNotFoundError()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	45
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	46 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	47 return tpl.render(data)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	48 except TemplateSyntaxError as tse:
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	49 raise self._getTemplatingError(tse)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	50
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	51 def renderFile(self, paths, data):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	52 self._ensureLoaded()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	53 tpl = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	54 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	55 for p in paths:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	56 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	57 tpl = self.env.get_template(p)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	58 break
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	59 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	60 raise self._getTemplatingError(tse)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	61 except TemplateNotFound:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	62 pass
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	63
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64 if tpl is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	65 raise TemplateNotFoundError()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	66
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	67 try:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	68 return tpl.render(data)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	69 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	70 raise self._getTemplatingError(tse)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	71
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	72 def _getTemplatingError(self, tse, filename=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	73 filename = tse.filename or filename
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	74 if filename and os.path.isabs(filename):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	75 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	76 err = TemplatingError(str(tse), filename, tse.lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	77 raise err from tse
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	78
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	79 def _ensureLoaded(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	80 if self.env:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	81 return
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	82
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	83 autoescape = self.app.config.get('jinja/auto_escape')
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	84 if autoescape is None:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	85 autoescape = self.app.config.get('twig/auto_escape')
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	86 if autoescape is None:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	87 autoescape = True
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	88
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	89 logger.debug("Creating Jinja environment with folders: %s" %
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	90 self.app.templates_dirs)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	91 loader = FileSystemLoader(self.app.templates_dirs)
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	92 extensions = [
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	93 PieCrustHighlightExtension,
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	94 PieCrustCacheExtension,
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	95 PieCrustSpacelessExtension,
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	96 PieCrustFormatExtension]
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	97 if autoescape:
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	98 extensions.append('jinja2.ext.autoescape')
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	99 self.env = PieCrustEnvironment(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	100 self.app,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	101 loader=loader,
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	102 extensions=extensions)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	103
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 class PieCrustEnvironment(Environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	106 def __init__(self, app, args, *kwargs):
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	107 self.app = app
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	108
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	109 # Before we create the base Environement, let's figure out the options
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	110 # we want to pass to it.
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	111 twig_compatibility_mode = app.config.get('jinja/twig_compatibility')
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	112
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	113 # Disable auto-reload when we're baking.
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	114 if app.config.get('baker/is_baking'):
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	115 kwargs.setdefault('auto_reload', False)
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	116
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	117 # Let the user override most Jinja options via the site config.
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	118 for name in ['block_start_string', 'block_end_string',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	119 'variable_start_string', 'variable_end_string',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	120 'comment_start_string', 'comment_end_string',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	121 'line_statement_prefix', 'line_comment_prefix',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	122 'trim_blocks', 'lstrip_blocks',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	123 'newline_sequence', 'keep_trailing_newline']:
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	124 val = app.config.get('jinja/' + name)
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	125 if val is not None:
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	126 kwargs.setdefault(name, val)
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	127
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	128 # Twig trims blocks.
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	129 if twig_compatibility_mode is True:
288 078e64dba77d jinja: Fix Twig compatibility for block trimming. Ludovic Chabant <ludovic@chabant.com> parents: 274 diff changeset	130 kwargs['trim_blocks'] = True
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	131
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	132 # All good! Create the Environment.
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	133 super(PieCrustEnvironment, self).__init__(args, *kwargs)
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	134
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	135 # Now add globals and filters.
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	136 self.globals.update({
293 d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	137 'fail': raise_exception,
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	138 'highlight_css': get_highlight_css})
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	139
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	140 self.filters.update({
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	141 'keys': get_dict_keys,
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	142 'values': get_dict_values,
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	143 'paginate': self._paginate,
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	144 'formatwith': self._formatWith,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	145 '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	146 '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	147 'nocache': add_no_cache_parameter,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	148 'wordcount': get_word_count,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	149 'stripoutertag': strip_outer_tag,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	150 'stripslash': strip_slash,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	151 'titlecase': title_case,
356 019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	152 'atomdate': get_xml_date,
019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	153 'xmldate': get_xml_date,
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	154 'emaildate': get_email_date,
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	155 'date': get_date})
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	156
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	157 # Backwards compatibility with Twig.
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	158 if twig_compatibility_mode is True:
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	159 self.filters['raw'] = self.filters['safe']
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	160 self.globals['pcfail'] = raise_exception
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	161
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	162 # Add route functions.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	163 for route in app.routes:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	164 name = route.template_func_name
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	165 func = self.globals.get(name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	166 if func is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	167 func = CompositeRouteFunction()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	168 func.addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169 self.globals[name] = func
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	170 elif isinstance(func, CompositeRouteFunction):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	171 self.globals[name].addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	172 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	173 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	174 "existing function or template data." %
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	175 name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	176
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	177 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	178 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	179 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	180 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	181 "on the execution stack.")
298 b7ab1b503510 data: Fix incorrect next/previous page URLs in pagination data. Ludovic Chabant <ludovic@chabant.com> parents: 293 diff changeset	182 first_uri, _ = split_sub_uri(self.app, cpi.render_ctx.uri)
352 498a917cd2d4 pagination: Make pagination use routes to generate proper URLs. Ludovic Chabant <ludovic@chabant.com> parents: 338 diff changeset	183 return Paginator(cpi.page, value,
498a917cd2d4 pagination: Make pagination use routes to generate proper URLs. Ludovic Chabant <ludovic@chabant.com> parents: 338 diff changeset	184 page_num=cpi.render_ctx.page_num,
498a917cd2d4 pagination: Make pagination use routes to generate proper URLs. Ludovic Chabant <ludovic@chabant.com> parents: 338 diff changeset	185 items_per_page=items_per_page)
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	186
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	187 def _formatWith(self, value, format_name):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	188 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	189
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	190
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	191 def raise_exception(msg):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	192 raise Exception(msg)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	193
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	194
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	195 def get_dict_keys(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	196 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	197 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	198 return value.keys()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	199
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	200
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	201 def get_dict_values(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	202 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	203 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	204 return value.values()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	205
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	206
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	207 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	208 if not param_value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	209 param_value = time.time()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	210 if '?' in value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	211 value += '&'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	212 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	213 value += '?'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	214 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	215 return value
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	216
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	217
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	218 def get_word_count(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	219 return len(value.split())
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	220
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	221
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	222 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	223 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	224 if tag is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	225 tag_pattern = re.escape(tag)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	226 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	227 m = re.match(pat, value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	228 if m:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	229 return m.group(1)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	230 return value
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	231
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 def strip_slash(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	234 return value.rstrip('/')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	235
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	236
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	237 def title_case(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	238 return value.title()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	239
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	240
356 019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	241 def get_xml_date(value):
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	242 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	243
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	244
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	245 def get_email_date(value, localtime=False):
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	246 return email.utils.formatdate(value, localtime=localtime)
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	247
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	248
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	249 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	250 if value == 'now':
19f3ac27c3d5 The `date` filter now supports passing `"now"` as in Twig. Ludovic Chabant <ludovic@chabant.com> parents: 19 diff changeset	251 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	252 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	253 suggest = php_format_to_strftime_format(fmt)
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	254 if suggest != fmt:
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	255 suggest_message = ("You probably want a format that looks "
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	256 "like: '%s'." % suggest)
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	257 else:
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	258 suggest_message = ("We can't suggest a proper date format "
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	259 "for you right now, though.")
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	260 raise Exception("PieCrust 1 date formats won't work in PieCrust 2. "
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	261 "%s\n"
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	262 "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	263 "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	264 "#strftime-and-strptime-behavior" %
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	265 suggest_message)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	266 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	267
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	268
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	269 class PieCrustFormatExtension(Extension):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	270 tags = set(['pcformat'])
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	271
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	272 def __init__(self, environment):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	273 super(PieCrustFormatExtension, self).__init__(environment)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	274
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	275 def parse(self, parser):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	276 lineno = next(parser.stream).lineno
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	277 args = [parser.parse_expression()]
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	278 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	279 return CallBlock(self.call_method('_format', args),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	280 [], [], body).set_lineno(lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	281
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	282 def _format(self, format_name, caller=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	283 body = caller()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	284 text = format_text(self.environment.app,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	285 format_name,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	286 Markup(body.rstrip()).unescape(),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	287 exact_format=True)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	288 return text
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	289
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	290
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 class PieCrustHighlightExtension(Extension):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	292 tags = set(['highlight', 'geshi'])
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	293
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	294 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	295 super(PieCrustHighlightExtension, self).__init__(environment)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	296
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	297 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	298 lineno = next(parser.stream).lineno
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	299
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	300 # Extract the language name.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	301 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	303 # Extract optional arguments.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	304 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	305 kwargs = {}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	306 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	307 name = parser.stream.expect('name')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	308 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	309 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	310 "highlighting tag." % name.value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	311 if kwarg_names[name.value] == 0:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	312 kwargs[name.value] = Const(True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	313 elif parser.stream.skip_if('assign'):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	314 kwargs[name.value] = parser.parse_expression()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	315
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	316 # body of the block
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	317 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	318 drop_needle=True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	319
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	320 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	321 [], [], body).set_lineno(lineno)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	322
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	323 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	324 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	325 # 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	326 body = caller()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	327
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	328 if lang is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	329 lexer = guess_lexer(body)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	330 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	331 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	332
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	333 if css_class is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	334 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	335 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	336 except AttributeError:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	337 pass
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	338
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	339 if css_class is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	340 formatter = HtmlFormatter(cssclass=css_class,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	341 linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	342 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	343 formatter = HtmlFormatter(linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	344
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	345 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	346 return code
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	347
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	348
293 d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	349 def get_highlight_css(class_name='.highlight'):
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	350 return HtmlFormatter().get_style_defs(class_name)
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	351
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	352
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	353 class PieCrustCacheExtension(Extension):
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	354 tags = set(['pccache', 'cache'])
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	355
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	356 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	357 super(PieCrustCacheExtension, self).__init__(environment)
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	358 self._lock = threading.RLock()
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	359
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	360 environment.extend(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	361 piecrust_cache_prefix='',
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	362 piecrust_cache={}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	363 )
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	364
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	365 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	366 # 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	367 # 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	368 # `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	369 # 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	370 lineno = next(parser.stream).lineno
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	371
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	372 # 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	373 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	374
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	375 # 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	376 # 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	377 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	378 drop_needle=True)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	379
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	380 # 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	381 # helper method on this extension.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	382 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	383 [], [], body).set_lineno(lineno)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	384
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	385 def _cache_support(self, name, caller):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	386 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	387
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	388 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	389 render_ctx = exc_stack.current_page_info.render_ctx
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	390 rdr_pass = render_ctx.current_pass_info
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	391
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	392 # 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	393 # 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	394 # it in the cache.
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	395 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	396 if pair is not None:
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	397 rdr_pass.used_source_names.update(pair[1])
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	398 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	399
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	400 with self._lock:
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	401 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	402 if pair is not None:
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	403 rdr_pass.used_source_names.update(pair[1])
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	404 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	405
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	406 prev_used = rdr_pass.used_source_names.copy()
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	407 rv = caller()
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	408 after_used = rdr_pass.used_source_names.copy()
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	409 used_delta = after_used.difference(prev_used)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	410 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	411 return rv
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	412
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	413
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	414 class PieCrustSpacelessExtension(HtmlCompressor):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	415 """ 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	416 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	417 """
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	418 def filter_stream(self, stream):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	419 ctx = StreamProcessContext(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	420 strip_depth = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	421 while 1:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	422 if stream.current.type == 'block_begin':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	423 for tk in ['strip', 'spaceless']:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	424 change = self._processToken(ctx, stream, tk)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	425 if change != 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	426 strip_depth += change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	427 if strip_depth < 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	428 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	429 break
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	430 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	431 ctx.token = stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	432 value = self.normalize(ctx)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	433 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	434 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	435 yield stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	436 next(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	437
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	438 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	439 change = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	440 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	441 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	442 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	443 if stream.current.value == test_token:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	444 change = 1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	445 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	446 change = -1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	447 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	448 if stream.current.type != 'block_end':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	449 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	450 describe_token(stream.current))
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	451 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	452 return change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	453
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	454
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	455 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	456 replacements = {
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	457 'd': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	458 'D': '%a',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	459 'j': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	460 'l': '%A',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	461 'w': '%w',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	462 'z': '%j',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	463 'W': '%W',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	464 'F': '%B',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	465 'm': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	466 'M': '%b',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	467 'n': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	468 'y': '%Y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	469 'Y': '%y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	470 'g': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	471 'G': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	472 'h': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	473 'H': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	474 'i': '%M',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	475 's': '%S',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	476 'e': '%Z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	477 'O': '%z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	478 '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	479 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	480

Mercurial > piecrust2

annotate piecrust/templating/jinjaengine.py @ 440:32c7c2d219d2