piecrust2: piecrust/templating/jinjaengine.py annotate

annotate piecrust/templating/jinjaengine.py @ 661:2f780b191541

internal: Fix a bug with registering taxonomy terms that are not strings. Some objects, like the blog data provider's taxnonomy entries, can render as strings, but are objects themselves. When registering them as "used terms", we need to use their string representation.

author	Ludovic Chabant <ludovic@chabant.com>
date	Tue, 01 Mar 2016 22:26:09 -0800
parents	7df0a959791c
children	cbd5cdec0695

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
528 cf3218766fe2 bug: Of course I broke something. Some exceptions need to pass through Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 524 diff changeset	18 from piecrust.environment import AbortedSourceUseError
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	19 from piecrust.rendering import format_text
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	20 from piecrust.routing import CompositeRouteFunction
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	21 from piecrust.templating.base import (TemplateEngine, TemplateNotFoundError,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	22 TemplatingError)
298 b7ab1b503510 data: Fix incorrect next/previous page URLs in pagination data. Ludovic Chabant <ludovic@chabant.com> parents: 293 diff changeset	23 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	24
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 logger = logging.getLogger(__name__)
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
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	29 class JinjaTemplateEngine(TemplateEngine):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	30 # Name `twig` is for backwards compatibility with PieCrust 1.x.
485 c40b7923c474 jinja: Support `.j2` file extensions. Ludovic Chabant <ludovic@chabant.com> parents: 454 diff changeset	31 ENGINE_NAMES = ['jinja', 'jinja2', 'j2', 'twig']
c40b7923c474 jinja: Support `.j2` file extensions. Ludovic Chabant <ludovic@chabant.com> parents: 454 diff changeset	32 EXTENSIONS = ['html', 'jinja', 'jinja2', 'j2', 'twig']
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	33
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	34 def __init__(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	35 self.env = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	36
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	37 def renderSegmentPart(self, path, seg_part, data):
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	38 self._ensureLoaded()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	39
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	40 if not _string_needs_render(seg_part.content):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	41 return seg_part.content
445 d8d86debea81 performance: Only use Jinja2 for rendering text if necessary. Ludovic Chabant <ludovic@chabant.com> parents: 395 diff changeset	42
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	43 part_path = _make_segment_part_path(path, seg_part.offset)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	44 self.env.loader.segment_parts_cache[part_path] = (
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	45 path, seg_part.content)
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	46 try:
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	47 tpl = self.env.get_template(part_path)
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	48 except TemplateSyntaxError as tse:
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	49 raise self._getTemplatingError(tse, filename=path)
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	50 except TemplateNotFound:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	51 raise TemplateNotFoundError()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	52
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	53 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	54 return tpl.render(data)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	55 except TemplateSyntaxError as tse:
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	56 raise self._getTemplatingError(tse)
528 cf3218766fe2 bug: Of course I broke something. Some exceptions need to pass through Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 524 diff changeset	57 except AbortedSourceUseError:
cf3218766fe2 bug: Of course I broke something. Some exceptions need to pass through Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 524 diff changeset	58 raise
524 4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	59 except Exception as ex:
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	60 msg = "Error rendering Jinja markup"
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	61 rel_path = os.path.relpath(path, self.app.root_dir)
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	62 raise TemplatingError(msg, rel_path) from ex
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	63
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64 def renderFile(self, paths, data):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	65 self._ensureLoaded()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	66 tpl = None
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	67 logger.debug("Looking for template: %s" % paths)
524 4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	68 rendered_path = None
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	69 for p in paths:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	70 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	71 tpl = self.env.get_template(p)
524 4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	72 rendered_path = p
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	73 break
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	74 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	75 raise self._getTemplatingError(tse)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	76 except TemplateNotFound:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	77 pass
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	78
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	79 if tpl is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	80 raise TemplateNotFoundError()
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	81
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	82 try:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	83 return tpl.render(data)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	84 except TemplateSyntaxError as tse:
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	85 raise self._getTemplatingError(tse)
528 cf3218766fe2 bug: Of course I broke something. Some exceptions need to pass through Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 524 diff changeset	86 except AbortedSourceUseError:
cf3218766fe2 bug: Of course I broke something. Some exceptions need to pass through Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 524 diff changeset	87 raise
524 4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	88 except Exception as ex:
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	89 msg = "Error rendering Jinja markup"
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	90 rel_path = os.path.relpath(rendered_path, self.app.root_dir)
4bca25f99463 serve: Improve Jinja rendering error reporting. Ludovic Chabant <ludovic@chabant.com> parents: 506 diff changeset	91 raise TemplatingError(msg, rel_path) from ex
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	92
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	93 def _getTemplatingError(self, tse, filename=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	94 filename = tse.filename or filename
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	95 if filename and os.path.isabs(filename):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	96 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	97 err = TemplatingError(str(tse), filename, tse.lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	98 raise err from tse
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	99
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	100 def _ensureLoaded(self):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	101 if self.env:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	102 return
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	103
487 61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	104 # Get the list of extensions to load.
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	105 ext_names = self.app.config.get('jinja/extensions', [])
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	106 if not isinstance(ext_names, list):
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	107 ext_names = [ext_names]
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	108
487 61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	109 # Turn on autoescape by default.
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	110 autoescape = self.app.config.get('twig/auto_escape')
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	111 if autoescape is not None:
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	112 logger.warning("The `twig/auto_escape` setting is now called "
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	113 "`jinja/auto_escape`.")
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	114 else:
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	115 autoescape = self.app.config.get('jinja/auto_escape', True)
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	116 if autoescape:
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	117 ext_names.append('autoescape')
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	118
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	119 # Create the final list of extensions.
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	120 extensions = [
e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	121 PieCrustHighlightExtension,
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	122 PieCrustCacheExtension,
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	123 PieCrustSpacelessExtension,
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	124 PieCrustFormatExtension]
487 61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	125 for n in ext_names:
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	126 if '.' not in n:
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	127 n = 'jinja2.ext.' + n
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	128 extensions.append(n)
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	129
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	130 # Create the Jinja environment.
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	131 logger.debug("Creating Jinja environment with folders: %s" %
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	132 self.app.templates_dirs)
61508ae67488 templating: Make Jinja support arbitrary extension, show warning for old stuff. Ludovic Chabant <ludovic@chabant.com> parents: 485 diff changeset	133 loader = PieCrustLoader(self.app.templates_dirs)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	134 self.env = PieCrustEnvironment(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	135 self.app,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	136 loader=loader,
59 e3e3de44377c Better handling of Jinja configuration. Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	137 extensions=extensions)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	138
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	139
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	140 def _string_needs_render(txt):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	141 index = txt.find('{')
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	142 while index >= 0:
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	143 ch = txt[index + 1]
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	144 if ch == '{' or ch == '%':
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	145 return True
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	146 index = txt.find('{', index + 1)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	147 return False
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	148
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	149
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	150 def _make_segment_part_path(path, start):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	151 return '$part=%s:%d' % (path, start)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	152
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	153
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	154 class PieCrustLoader(FileSystemLoader):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	155 def __init__(self, searchpath, encoding='utf-8'):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	156 super(PieCrustLoader, self).__init__(searchpath, encoding)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	157 self.segment_parts_cache = {}
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	158
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	159 def get_source(self, environment, template):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	160 if template.startswith('$part='):
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	161 filename, seg_part = self.segment_parts_cache[template]
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	162
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	163 mtime = os.path.getmtime(filename)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	164
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	165 def uptodate():
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	166 try:
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	167 return os.path.getmtime(filename) == mtime
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	168 except OSError:
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	169 return False
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	170
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	171 return seg_part, filename, uptodate
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	172
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	173 return super(PieCrustLoader, self).get_source(environment, template)
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	174
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	175
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	176 class PieCrustEnvironment(Environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	177 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	178 self.app = app
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	179
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	180 # 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	181 # 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	182 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	183
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	184 # 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	185 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	186 kwargs.setdefault('auto_reload', False)
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	187
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	188 # 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	189 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	190 '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	191 '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	192 '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	193 'trim_blocks', 'lstrip_blocks',
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	194 'newline_sequence', 'keep_trailing_newline']:
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	195 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	196 if val is not None:
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	197 kwargs.setdefault(name, val)
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	198
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	199 # Twig trims blocks.
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	200 if twig_compatibility_mode is True:
288 078e64dba77d jinja: Fix Twig compatibility for block trimming. Ludovic Chabant <ludovic@chabant.com> parents: 274 diff changeset	201 kwargs['trim_blocks'] = True
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	202
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	203 # All good! Create the Environment.
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	204 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	205
1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	206 # Now add globals and filters.
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	207 self.globals.update({
531 63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	208 'now': get_now_date(),
293 d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	209 'fail': raise_exception,
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	210 '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	211
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	212 self.filters.update({
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	213 'keys': get_dict_keys,
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	214 'values': get_dict_values,
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	215 'paginate': self._paginate,
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	216 'formatwith': self._formatWith,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	217 '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	218 '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	219 'nocache': add_no_cache_parameter,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	220 'wordcount': get_word_count,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	221 'stripoutertag': strip_outer_tag,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	222 'stripslash': strip_slash,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	223 'titlecase': title_case,
356 019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	224 'atomdate': get_xml_date,
019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	225 '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	226 'emaildate': get_email_date,
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	227 'date': get_date})
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	228
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	229 # Backwards compatibility with Twig.
274 1163bd034dc5 jinja: Provide a more "standard" Jinja configuration by default. Ludovic Chabant <ludovic@chabant.com> parents: 184 diff changeset	230 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	231 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	232 self.globals['pcfail'] = raise_exception
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	233
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	234 # Add route functions.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	235 for route in app.routes:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	236 name = route.template_func_name
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	237 func = self.globals.get(name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	238 if func is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	239 func = CompositeRouteFunction()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	240 func.addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	241 self.globals[name] = func
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	242 elif isinstance(func, CompositeRouteFunction):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	243 self.globals[name].addFunc(route)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	244 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	245 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	246 "existing function or template data." %
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	247 name)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	248
19 dc72a288921f Add the `paginate` filter to Jinja, activate `auto_reload`. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	249 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	250 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	251 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	252 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	253 "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	254 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	255 return Paginator(cpi.page, value,
498a917cd2d4 pagination: Make pagination use routes to generate proper URLs. Ludovic Chabant <ludovic@chabant.com> parents: 338 diff changeset	256 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	257 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	258
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	259 def _formatWith(self, value, format_name):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	260 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	261
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	262
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	263 def raise_exception(msg):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	264 raise Exception(msg)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	265
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	266
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	267 def get_dict_keys(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	268 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	269 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	270 return value.keys()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	271
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	272
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	273 def get_dict_values(value):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	274 if isinstance(value, list):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	275 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	276 return value.values()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	277
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	278
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	279 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	280 if not param_value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	281 param_value = time.time()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	282 if '?' in value:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	283 value += '&'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285 value += '?'
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	286 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	287 return value
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	288
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	289
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290 def get_word_count(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 return len(value.split())
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
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	294 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	295 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	296 if tag is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	297 tag_pattern = re.escape(tag)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	298 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	299 m = re.match(pat, value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	300 if m:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	301 return m.group(1)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302 return value
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
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	305 def strip_slash(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	306 return value.rstrip('/')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	307
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	308
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	309 def title_case(value):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	310 return value.title()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	311
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	312
356 019d274e6713 data: Also expose XML date formatting as `xmldate` in Jinja. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	313 def get_xml_date(value):
537 7df0a959791c templating: Make more date functions accept 'now' as an input. Ludovic Chabant <ludovic@chabant.com> parents: 531 diff changeset	314 if value == 'now':
7df0a959791c templating: Make more date functions accept 'now' as an input. Ludovic Chabant <ludovic@chabant.com> parents: 531 diff changeset	315 value = time.time()
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	316 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	317
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	318
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	319 def get_email_date(value, localtime=False):
537 7df0a959791c templating: Make more date functions accept 'now' as an input. Ludovic Chabant <ludovic@chabant.com> parents: 531 diff changeset	320 if value == 'now':
7df0a959791c templating: Make more date functions accept 'now' as an input. Ludovic Chabant <ludovic@chabant.com> parents: 531 diff changeset	321 value = time.time()
326 1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	322 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	323
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	324
531 63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	325 def get_now_date():
63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	326 return time.time()
63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	327
63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	328
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	329 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	330 if value == 'now':
19f3ac27c3d5 The `date` filter now supports passing `"now"` as in Twig. Ludovic Chabant <ludovic@chabant.com> parents: 19 diff changeset	331 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	332 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	333 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	334 if suggest != fmt:
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	335 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	336 "like: '%s'." % suggest)
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	337 else:
1ecc0c16ba64 data: Better error message for old date formats, add `emaildate` filter. Ludovic Chabant <ludovic@chabant.com> parents: 298 diff changeset	338 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	339 "for you right now, though.")
531 63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	340 raise Exception("Got incorrect date format: '%s\n"
63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	341 "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	342 "%s\n"
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	343 "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	344 "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	345 "#strftime-and-strptime-behavior" %
531 63ae5eae90ca templating: Add `now` global to Jinja, improve date error message. Ludovic Chabant <ludovic@chabant.com> parents: 528 diff changeset	346 (fmt, suggest_message))
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	347 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	348
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	349
128 28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	350 class PieCrustFormatExtension(Extension):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	351 tags = set(['pcformat'])
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	352
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	353 def __init__(self, environment):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	354 super(PieCrustFormatExtension, self).__init__(environment)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	355
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	356 def parse(self, parser):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	357 lineno = next(parser.stream).lineno
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	358 args = [parser.parse_expression()]
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	359 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	360 return CallBlock(self.call_method('_format', args),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	361 [], [], body).set_lineno(lineno)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	362
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	363 def _format(self, format_name, caller=None):
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	364 body = caller()
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	365 text = format_text(self.environment.app,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	366 format_name,
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	367 Markup(body.rstrip()).unescape(),
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	368 exact_format=True)
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	369 return text
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	370
28444014ce7d Fix error reporting and counting of lines. Ludovic Chabant <ludovic@chabant.com> parents: 89 diff changeset	371
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	372 class PieCrustHighlightExtension(Extension):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	373 tags = set(['highlight', 'geshi'])
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 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	376 super(PieCrustHighlightExtension, self).__init__(environment)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	377
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	378 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	379 lineno = next(parser.stream).lineno
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	380
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	381 # Extract the language name.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	382 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	383
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	384 # Extract optional arguments.
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	385 kwarg_names = {'line_numbers': 0, 'use_classes': 0, 'class': 1,
96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	386 'id': 1}
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	387 kwargs = {}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	388 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	389 name = parser.stream.expect('name')
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	390 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	391 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	392 "highlighting tag." % name.value)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	393 if kwarg_names[name.value] == 0:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	394 kwargs[name.value] = Const(True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	395 elif parser.stream.skip_if('assign'):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	396 kwargs[name.value] = parser.parse_expression()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	397
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	398 # body of the block
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	399 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	400 drop_needle=True)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	401
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	402 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	403 [], [], body).set_lineno(lineno)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	404
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	405 def _highlight(self, lang, line_numbers=False, use_classes=False,
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	406 css_class=None, css_id=None, caller=None):
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	407 # 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	408 body = caller()
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	409
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	410 if lang is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	411 lexer = guess_lexer(body)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	412 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	413 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	414
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	415 if css_class is None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	416 try:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	417 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	418 except AttributeError:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	419 pass
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	420
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	421 if css_class is not None:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	422 formatter = HtmlFormatter(cssclass=css_class,
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	423 linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	424 else:
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	425 formatter = HtmlFormatter(linenos=line_numbers)
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	426
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	427 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	428 return code
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	429
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	430
506 6ca1b6fb9964 templating: `highlight_css` can be passed the name of a Pygments style. Ludovic Chabant <ludovic@chabant.com> parents: 487 diff changeset	431 def get_highlight_css(style_name='default', class_name='.highlight'):
6ca1b6fb9964 templating: `highlight_css` can be passed the name of a Pygments style. Ludovic Chabant <ludovic@chabant.com> parents: 487 diff changeset	432 return HtmlFormatter(style=style_name).get_style_defs(class_name)
293 d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	433
d013cc191922 jinja: Add a global function to render Pygments' CSS styles. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	434
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	435 class PieCrustCacheExtension(Extension):
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	436 tags = set(['pccache', 'cache'])
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	437
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	438 def __init__(self, environment):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	439 super(PieCrustCacheExtension, self).__init__(environment)
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	440 self._lock = threading.RLock()
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	441
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	442 environment.extend(
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	443 piecrust_cache_prefix='',
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	444 piecrust_cache={}
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	445 )
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	446
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	447 def parse(self, parser):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	448 # 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	449 # 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	450 # `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	451 # 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	452 lineno = next(parser.stream).lineno
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	453
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	454 # 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	455 args = [parser.parse_expression()]
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	456
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	457 # 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	458 # 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	459 body = parser.parse_statements(['name:endpccache', 'name:endcache'],
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	460 drop_needle=True)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	461
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	462 # 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	463 # helper method on this extension.
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	464 return CallBlock(self.call_method('_cache_support', args),
454 96d363e2da4b templating: Let Jinja2 cache the parsed template for page contents. Ludovic Chabant <ludovic@chabant.com> parents: 446 diff changeset	465 [], [], body).set_lineno(lineno)
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	466
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	467 def _cache_support(self, name, caller):
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	468 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	469
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	470 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	471 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	472 rdr_pass = render_ctx.current_pass_info
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	473
3 f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	474 # 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	475 # 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	476 # it in the cache.
89 e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	477 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	478 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	479 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	480 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	481
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	482 with self._lock:
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	483 pair = self.environment.piecrust_cache.get(key)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	484 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	485 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	486 return pair[0]
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	487
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	488 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	489 rv = caller()
338 938be93215cb bake: Improve render context and bake record, fix incremental bake bugs. Ludovic Chabant <ludovic@chabant.com> parents: 326 diff changeset	490 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	491 used_delta = after_used.difference(prev_used)
e771c202583a Fixes to the `cache` Jinja tag. Ludovic Chabant <ludovic@chabant.com> parents: 65 diff changeset	492 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	493 return rv
f485ba500df3 Gigantic change to basically make PieCrust 2 vaguely functional. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	494
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	495
65 071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	496 class PieCrustSpacelessExtension(HtmlCompressor):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	497 """ 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	498 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	499 """
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	500 def filter_stream(self, stream):
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	501 ctx = StreamProcessContext(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	502 strip_depth = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	503 while 1:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	504 if stream.current.type == 'block_begin':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	505 for tk in ['strip', 'spaceless']:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	506 change = self._processToken(ctx, stream, tk)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	507 if change != 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	508 strip_depth += change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	509 if strip_depth < 0:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	510 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	511 break
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	512 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	513 ctx.token = stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	514 value = self.normalize(ctx)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	515 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	516 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	517 yield stream.current
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	518 next(stream)
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	519
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	520 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	521 change = 0
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	522 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	523 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	524 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	525 if stream.current.value == test_token:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	526 change = 1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	527 else:
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	528 change = -1
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	529 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	530 if stream.current.type != 'block_end':
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	531 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	532 describe_token(stream.current))
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	533 stream.skip()
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	534 return change
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	535
071cc99b1779 Jinja templating now has `spaceless`, `\|keys` and `\|values`. Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	536
41 1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	537 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	538 replacements = {
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	539 'd': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	540 'D': '%a',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	541 'j': '%d',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	542 'l': '%A',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	543 'w': '%w',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	544 'z': '%j',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	545 'W': '%W',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	546 'F': '%B',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	547 'm': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	548 'M': '%b',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	549 'n': '%m',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	550 'y': '%Y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	551 'Y': '%y',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	552 'g': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	553 'G': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	554 'h': '%I',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	555 'H': '%H',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	556 'i': '%M',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	557 's': '%S',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	558 'e': '%Z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	559 'O': '%z',
1a30e3d7ee47 Error out if `date` filter is used with PHP date formats. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	560 '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	561 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	562

Mercurial > piecrust2

annotate piecrust/templating/jinjaengine.py @ 661:2f780b191541