]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
6 years agodocs: Python3-ize the examples 1010/head
Deepak Amin [Fri, 31 May 2019 18:17:35 +0000 (14:17 -0400)] 
docs: Python3-ize the examples

This commit updates the examples to conform to Python 3 instead
of Python 2, as Python 3 is more acceptable these days.

6 years agoMerge pull request #988 from tbnorth/triv_docs_link
Kevin Brown [Sat, 11 May 2019 21:43:03 +0000 (17:43 -0400)] 
Merge pull request #988 from tbnorth/triv_docs_link

fixes #242, deletes link to Jinja 1 docs.

6 years agoAdd new maintenance branch format to Travis (#987)
Kevin Brown [Tue, 7 May 2019 14:38:32 +0000 (10:38 -0400)] 
Add new maintenance branch format to Travis (#987)

* Added new maintenance branch format to Travis

The maintenance branch format appeared to change from
`[version]-maintenance` to `[version].x` in the recent months, and
this broke Travis CI builds made to those branches. Because they
no longer meet the branch regex, the pull requests builds against
these branches were no longer being run.

This ads the regex for any branch which ends in `.x`, which should
catch the new pattern for maintenance branches.

* Use the branch regex from werkzeug

This is more specific to only catch version number branches.

* Sync with master

Apparently the build configuration for this branch is very old and doesn't match master at all.

6 years agofixes #242, deletes link to Jinja 1 docs. 988/head
Terry N. Brown [Mon, 6 May 2019 16:33:13 +0000 (12:33 -0400)] 
fixes #242, deletes link to Jinja 1 docs.

This just fixes a broken link by deleteing it.

I'm assuming Jinja 1 docs. aren't readily available anymore.
I looked for a git tag for version 1 as an alternative target,
but didn't see that either.

6 years agoMerge pull request #982 from kevin-brown/sphinx-upgrade
David Lord [Mon, 6 May 2019 14:24:09 +0000 (10:24 -0400)] 
Merge pull request #982 from kevin-brown/sphinx-upgrade

Fix tox docs-html builds

6 years agoFix tox docs-html builds 982/head
Kevin Brown [Mon, 6 May 2019 14:07:48 +0000 (10:07 -0400)] 
Fix tox docs-html builds

These have been broken for about a month now because of the upgrade
to Sphinx 2. This upgrade happened automatically because we do not
have the version pinned.

Luckily this issue appears to only be from having Python 2 syntax in
the docs script, so making that compatible with Python 3 fixes the
error and allows the docs to pass.

6 years agorelease 2.10.1 2.10.1
David Lord [Sat, 6 Apr 2019 18:02:53 +0000 (11:02 -0700)] 
release 2.10.1

6 years agosandbox str.format_map
Armin Ronacher [Sat, 6 Apr 2019 17:50:47 +0000 (10:50 -0700)] 
sandbox str.format_map

7 years agoBump version number to 2.10 2.10
David Lord [Wed, 8 Nov 2017 19:58:35 +0000 (11:58 -0800)] 
Bump version number to 2.10

7 years agoclean up MANIFEST.in
David Lord [Wed, 1 Nov 2017 14:57:12 +0000 (07:57 -0700)] 
clean up MANIFEST.in
clean up make-release.py for py3
add rst extension to CHANGES for GitHub
clean up changelog formatting

7 years agoSupport filters in set block 489/head
ThiefMaster [Fri, 11 Sep 2015 22:27:07 +0000 (00:27 +0200)] 
Support filters in set block

- e.g {% set foo | trim %}...{% endset %}
- closes #486

7 years agoMerge pull request #708 from jctanner/NATIVE_TYPES
David Lord [Tue, 31 Oct 2017 19:16:10 +0000 (12:16 -0700)] 
Merge pull request #708 from jctanner/NATIVE_TYPES

Add support for the Environment to optionally return native types.

7 years agoMerge branch 'master' into NATIVE_TYPES 708/head
David Lord [Tue, 31 Oct 2017 15:51:53 +0000 (08:51 -0700)] 
Merge branch 'master' into NATIVE_TYPES

7 years agoFix typo in docstring (#779)
Ricardo Lafuente [Mon, 16 Oct 2017 11:11:44 +0000 (12:11 +0100)] 
Fix typo in docstring (#779)

7 years agocodecov needs argparse on 2.6
David Lord [Sun, 8 Oct 2017 20:15:09 +0000 (13:15 -0700)] 
codecov needs argparse on 2.6

7 years agoMinor docstring grammar fix (#772)
Eli Boyarski [Mon, 18 Sep 2017 14:24:38 +0000 (17:24 +0300)] 
Minor docstring grammar fix (#772)

7 years agos/Add/Added/ in CHANGES
Adrian Moennich [Tue, 22 Aug 2017 21:24:52 +0000 (23:24 +0200)] 
s/Add/Added/ in CHANGES

Pretty much all other entries also use past tense

7 years agoMerge branch '2.9-maintenance'
Adrian Moennich [Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)] 
Merge branch '2.9-maintenance'

7 years agoCompile `elif` tag to `elif` instead of `else: if` 760/head
Adrian Moennich [Tue, 22 Aug 2017 20:59:57 +0000 (22:59 +0200)] 
Compile `elif` tag to `elif` instead of `else: if`

This avoids deep nesting in case of many `{% elif .. %}` blocks (which
would fail during execution) and also deep recursion (which may fail
during compilation)

fixes #759

7 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Wed, 9 Aug 2017 07:07:04 +0000 (09:07 +0200)] 
Merge branch '2.9-maintenance'

7 years agoAdded a changelog entry
Armin Ronacher [Wed, 9 Aug 2017 07:06:39 +0000 (09:06 +0200)] 
Added a changelog entry

7 years agoFix regression in 2.9 involving unsafe Context.get_all() usage
Zac Medico [Tue, 8 Aug 2017 22:00:20 +0000 (15:00 -0700)] 
Fix regression in 2.9 involving unsafe Context.get_all() usage

Since commit d67f0fd4cc2a4af08f51f4466150d49da7798729, callers
of Context.get_all() need to make a copy it they're going to
modify the result.

Fixes: d67f0fd4cc2a ("Generalize scoping. This fixes #603")
8 years agoquickly fix py3 tests
James Tanner [Wed, 26 Jul 2017 02:11:22 +0000 (22:11 -0400)] 
quickly fix py3 tests

8 years agoAdd requested patch for safe_repr and nodes.Impossible
James Tanner [Wed, 26 Jul 2017 01:48:12 +0000 (21:48 -0400)] 
Add requested patch for safe_repr and nodes.Impossible

8 years agoMerge branch 'master' into NATIVE_TYPES
Adrian [Fri, 14 Jul 2017 15:19:17 +0000 (17:19 +0200)] 
Merge branch 'master' into NATIVE_TYPES

8 years agoMerge pull request #672 from alexk307/tests-memcached-bytecode-cache
David Lord [Sun, 9 Jul 2017 16:00:57 +0000 (09:00 -0700)] 
Merge pull request #672 from alexk307/tests-memcached-bytecode-cache

Adds tests for the memcached bytecode cache module

8 years agorewrite tests to match usage 672/head
David Lord [Sun, 9 Jul 2017 15:39:25 +0000 (08:39 -0700)] 
rewrite tests to match usage

8 years agoAdds tests for the memcached bytecode cache module
Alex Kahan [Fri, 27 Jan 2017 18:13:12 +0000 (13:13 -0500)] 
Adds tests for the memcached bytecode cache module

8 years agoMerge pull request #692 from dnmvisser/dictsort_reverse
David Lord [Sat, 8 Jul 2017 16:10:33 +0000 (09:10 -0700)] 
Merge pull request #692 from dnmvisser/dictsort_reverse

Dictsort reverse

8 years agoadd test and changelog 692/head
David Lord [Sat, 8 Jul 2017 16:04:29 +0000 (09:04 -0700)] 
add test and changelog
use ignore_case function

8 years ago'reverse' option for dictsort
Dick Visser [Thu, 9 Mar 2017 20:37:42 +0000 (21:37 +0100)] 
'reverse' option for dictsort

8 years agoMerge pull request #502 from berrange/callable
David Lord [Fri, 7 Jul 2017 21:00:44 +0000 (14:00 -0700)] 
Merge pull request #502 from berrange/callable

runtime: avoid assumption that all objects provide __call__

8 years agoMerge pull request #685 from jkfran/master
David Lord [Fri, 7 Jul 2017 18:55:24 +0000 (11:55 -0700)] 
Merge pull request #685 from jkfran/master

Ignore empty lines in indent filter #681

8 years agoshorten arguments 685/head
David Lord [Fri, 7 Jul 2017 18:46:19 +0000 (11:46 -0700)] 
shorten arguments
add test for single line
update changelog

8 years agoIgnore empty lines in indent filter
Francisco Jiménez Cabrera [Wed, 1 Mar 2017 23:10:29 +0000 (00:10 +0100)] 
Ignore empty lines in indent filter

8 years agoMerge pull request #617 from jackwilsdon/dont-skip-comma
David Lord [Fri, 7 Jul 2017 16:56:01 +0000 (09:56 -0700)] 
Merge pull request #617 from jackwilsdon/dont-skip-comma

Don't skip an erroneous comma when parsing "from"

8 years agoadd test and changelog 617/head
David Lord [Fri, 7 Jul 2017 16:51:31 +0000 (09:51 -0700)] 
add test and changelog

8 years agoDon't skip an erroneous comma when parsing from
Jack Wilsdon [Sun, 30 Oct 2016 21:57:12 +0000 (21:57 +0000)] 
Don't skip an erroneous comma when parsing from

Currently we skip an extra comma when "with context" is not provided to
the "from" statement. This allows invalid code such as this:

  {% from "functions.html" import my_function,, %}

The primary issue with this is that it is not consistent when providing
"with context". The following code throws an error, contrary to the
previous example:

  {% from "functions.html" import my_function,, with context %}

It seems that the comma skipping was originally found in 0611e49 and was
accidentally put inside the "with context" check in ea847c5. It was then
updated to use "skip_if" in fdf9530.

There doesn't seem to be any reason for this check existing, as
double commas should never be allowed and serve no purpose in the
statement.

8 years agoMerge pull request #618 from jackwilsdon/stricter-from-parsing
David Lord [Fri, 7 Jul 2017 16:40:35 +0000 (09:40 -0700)] 
Merge pull request #618 from jackwilsdon/stricter-from-parsing

Add stricter checking to "from ... import ..."

8 years agoadd tests and changelog 618/head
David Lord [Fri, 7 Jul 2017 16:34:32 +0000 (09:34 -0700)] 
add tests and changelog

8 years agoAdd stricter checking to "from ... import ..."
Jack Wilsdon [Sun, 30 Oct 2016 22:11:21 +0000 (22:11 +0000)] 
Add stricter checking to "from ... import ..."

Currently token parsing on "from ... import ..." is rather "loose" — it
sees the following "invalid" code as perfectly valid:

  {% from "functions" import my_function, %}
  {% from "functions" import, %}
  {% from "functions" import %}

This is caused by the parser ignoring non-name values where there should
be names, either as the first value or after commas.

This commit ensures only name values are allowed as the first value and
any values after commas in the import section.

8 years agoMerge pull request #740 from davidism/optimize-tests
David Lord [Fri, 7 Jul 2017 15:20:34 +0000 (08:20 -0700)] 
Merge pull request #740 from davidism/optimize-tests

Inline template tests during optimization

8 years agoInline template tests during optimization 740/head
Sebastian Noack [Mon, 10 Aug 2015 07:51:36 +0000 (09:51 +0200)] 
Inline template tests during optimization

8 years agoAdd support for the Environment to optionally return native types.
James Tanner [Thu, 27 Apr 2017 21:14:42 +0000 (17:14 -0400)] 
Add support for the Environment to optionally return native types.

This works by having an alternate CodeGenerator that avoids doing to_string
after the yield statement and a new version of concat that handles the returned
generator with a bit more "intelligence".

8 years agoMerge pull request #665 from pallets/operator-tests
David Lord [Thu, 6 Jul 2017 20:06:44 +0000 (13:06 -0700)] 
Merge pull request #665 from pallets/operator-tests

Allow using comparison operator symbols as tests

8 years agoallow using comparison operator symbols as tests 665/head
David Lord [Fri, 20 Jan 2017 04:40:31 +0000 (20:40 -0800)] 
allow using comparison operator symbols as tests
add tests and aliases for all comparison operators
adjust docs to prefer short names for compare tests
closes #664

8 years agoMerge pull request #738 from davidism/test-config
David Lord [Thu, 6 Jul 2017 18:15:37 +0000 (11:15 -0700)] 
Merge pull request #738 from davidism/test-config

Standard test config

8 years agostandard test configuration 738/head
David Lord [Thu, 6 Jul 2017 18:07:02 +0000 (11:07 -0700)] 
standard test configuration
add branch coverage and codecov

8 years agofix docs warnings
David Lord [Thu, 6 Jul 2017 17:43:21 +0000 (10:43 -0700)] 
fix docs warnings

8 years agoremove test copied from markupsafe
David Lord [Thu, 6 Jul 2017 17:41:46 +0000 (10:41 -0700)] 
remove test copied from markupsafe

8 years agoMerge pull request #737 from davidism/minmax-filters
David Lord [Thu, 6 Jul 2017 15:48:07 +0000 (08:48 -0700)] 
Merge pull request #737 from davidism/minmax-filters

min and max filters

8 years agoparametrize tests 737/head
David Lord [Thu, 6 Jul 2017 15:37:17 +0000 (08:37 -0700)] 
parametrize tests
argument order consistent with existing filters
add changelog

8 years agoAdded min and max filters
Sebastian Noack [Tue, 4 Aug 2015 20:11:55 +0000 (22:11 +0200)] 
Added min and max filters

8 years agoMerge pull request #735 from davidism/unique-filter
David Lord [Wed, 5 Jul 2017 21:27:45 +0000 (14:27 -0700)] 
Merge pull request #735 from davidism/unique-filter

Unique filter

8 years agomake attrgetter take generic postprocess function 735/head
David Lord [Wed, 5 Jul 2017 21:22:27 +0000 (14:22 -0700)] 
make attrgetter take generic postprocess function
add changelog

8 years agoMerge branch 'master' into unique-filter
David Lord [Wed, 5 Jul 2017 18:58:34 +0000 (11:58 -0700)] 
Merge branch 'master' into unique-filter

8 years agoMerge pull request #734 from davidism/dont-inline-random
David Lord [Wed, 5 Jul 2017 18:52:20 +0000 (11:52 -0700)] 
Merge pull request #734 from davidism/dont-inline-random

Prevent random filter from being folded

8 years agofix random test for py2 734/head
David Lord [Wed, 5 Jul 2017 18:17:09 +0000 (11:17 -0700)] 
fix random test for py2
add changelog

8 years agotest compares random filter to random call with same seed
David Lord [Wed, 5 Jul 2017 18:09:24 +0000 (11:09 -0700)] 
test compares random filter to random call with same seed

8 years agoMerge branch 'master' into dont-inline-random
David Lord [Wed, 5 Jul 2017 17:11:00 +0000 (10:11 -0700)] 
Merge branch 'master' into dont-inline-random

8 years agoMerge pull request #731 from pallets/feature/kill-stringdefs
David Lord [Tue, 4 Jul 2017 18:04:30 +0000 (11:04 -0700)] 
Merge pull request #731 from pallets/feature/kill-stringdefs

Use str.isidentifier to match idents on python 3

8 years agogo back to generating regex, simplified 731/head
David Lord [Tue, 4 Jul 2017 16:54:18 +0000 (09:54 -0700)] 
go back to generating regex, simplified
new version uses ~2KB vs 200KB memory, is ~100x faster to load
move script to generate pattern to scripts directory
add more tests

8 years agoremove unnecessary \b from name regex
David Lord [Mon, 3 Jul 2017 16:40:07 +0000 (09:40 -0700)] 
remove unnecessary \b from name regex

8 years agoAdd support for `{% trans trimmed ... %}`
Adrian Moennich [Fri, 17 Feb 2017 22:49:39 +0000 (23:49 +0100)] 
Add support for `{% trans trimmed ... %}`

Same behavior as in Django: All linebreaks and the whitespace
surrounding linebreaks are replaced with a single space.

closes #504

8 years agoswitch back to unicode escapes
David Lord [Sun, 2 Jul 2017 16:37:57 +0000 (09:37 -0700)] 
switch back to unicode escapes

8 years agofix unicode for py2
David Lord [Sun, 2 Jul 2017 16:30:41 +0000 (09:30 -0700)] 
fix unicode for py2

8 years agoonly test master and maintenance branches
David Lord [Sun, 2 Jul 2017 16:19:02 +0000 (09:19 -0700)] 
only test master and maintenance branches
avoids duplicate work for internal prs

8 years agotest for new identifier lexer
David Lord [Sun, 2 Jul 2017 16:18:20 +0000 (09:18 -0700)] 
test for new identifier lexer
currently fails on special case unicode

8 years agoAdded missing identifiers to the name re
Armin Ronacher [Sat, 1 Jul 2017 22:30:25 +0000 (00:30 +0200)] 
Added missing identifiers to the name re

8 years agoInversed invalid logic
Armin Ronacher [Sat, 1 Jul 2017 21:29:23 +0000 (23:29 +0200)] 
Inversed invalid logic

8 years agoUse str.isidentifier to match idents on python 3
Armin Ronacher [Sat, 1 Jul 2017 18:41:24 +0000 (20:41 +0200)] 
Use str.isidentifier to match idents on python 3

8 years agoMerge pull request #684 from ThiefMaster/set-namespaces
Adrian [Sat, 24 Jun 2017 09:00:47 +0000 (11:00 +0200)] 
Merge pull request #684 from ThiefMaster/set-namespaces

Add namespace objects that support attribute assignment

8 years agoDon't allow setting real attributes on ns objects 684/head
Adrian Moennich [Wed, 5 Apr 2017 18:57:22 +0000 (20:57 +0200)] 
Don't allow setting real attributes on ns objects

https://github.com/pallets/jinja/pull/684#issuecomment-291958060

8 years agoAdd docs for namespace functionality
Adrian Moennich [Sun, 26 Feb 2017 17:00:06 +0000 (18:00 +0100)] 
Add docs for namespace functionality

8 years agoAdd unit tests for namespace functionality
Adrian Moennich [Sun, 26 Feb 2017 16:28:47 +0000 (17:28 +0100)] 
Add unit tests for namespace functionality

8 years agoAdd support for namespace attribute assignment
Adrian Moennich [Sun, 26 Feb 2017 15:45:54 +0000 (16:45 +0100)] 
Add support for namespace attribute assignment

8 years agoMerge pull request #676 from ThiefMaster/loop-lookarounds
Adrian [Sat, 24 Jun 2017 08:55:37 +0000 (10:55 +0200)] 
Merge pull request #676 from ThiefMaster/loop-lookarounds

Add previtem/nextitem/changed() to loop context

8 years agoAdd changed() to loop context 676/head
Adrian Moennich [Wed, 1 Feb 2017 20:47:17 +0000 (21:47 +0100)] 
Add changed() to loop context

8 years agoAdd previtem/nextitem to loop context
Adrian Moennich [Wed, 1 Feb 2017 20:05:03 +0000 (21:05 +0100)] 
Add previtem/nextitem to loop context

related: #641

8 years agoAdd @ThiefMaster to list of contributors
Adrian Moennich [Wed, 1 Feb 2017 20:27:55 +0000 (21:27 +0100)] 
Add @ThiefMaster to list of contributors

8 years agoMerge pull request #721 from jpassaro/issue_720
David Lord [Fri, 2 Jun 2017 15:40:52 +0000 (08:40 -0700)] 
Merge pull request #721 from jpassaro/issue_720

disable recursive comments in vim syntax file

8 years agodisable recursive comments in vim syntax file 721/head
John Passaro [Fri, 2 Jun 2017 15:23:36 +0000 (11:23 -0400)] 
disable recursive comments in vim syntax file

Fixes #720

8 years agoMerge pull request #718 from ayalash/issue_709
David Lord [Tue, 23 May 2017 21:58:02 +0000 (14:58 -0700)] 
Merge pull request #718 from ayalash/issue_709

Make tojson always safe (fix #709)

8 years agoadd changelog 718/head
David Lord [Tue, 23 May 2017 21:57:34 +0000 (14:57 -0700)] 
add changelog
[ci skip]

8 years agoMake tojson always safe (fix #709)
Ayala Shachar [Tue, 23 May 2017 17:24:52 +0000 (10:24 -0700)] 
Make tojson always safe (fix #709)

8 years agoMerge pull request #703 from jdufresne/https
David Lord [Sun, 9 Apr 2017 22:57:56 +0000 (15:57 -0700)] 
Merge pull request #703 from jdufresne/https

In documentation, prefer https over http when available

8 years agoIn documentation, prefer https over http when available 703/head
Jon Dufresne [Sun, 9 Apr 2017 22:18:38 +0000 (15:18 -0700)] 
In documentation, prefer https over http when available

8 years agoMerge pull request #702 from jdufresne/rm-debug-print
David Lord [Sun, 9 Apr 2017 21:33:16 +0000 (14:33 -0700)] 
Merge pull request #702 from jdufresne/rm-debug-print

Remove print() output during test

8 years agoMerge pull request #701 from jdufresne/trove-36
David Lord [Sun, 9 Apr 2017 21:32:53 +0000 (14:32 -0700)] 
Merge pull request #701 from jdufresne/trove-36

Add trove classifier for Python 3.6

8 years agoRemove print() output during test 702/head
Jon Dufresne [Sun, 9 Apr 2017 21:27:27 +0000 (14:27 -0700)] 
Remove print() output during test

Looks like it was left in from debugging.

8 years agoAdd trove classifier for Python 3.6 701/head
Jon Dufresne [Sun, 9 Apr 2017 21:24:33 +0000 (14:24 -0700)] 
Add trove classifier for Python 3.6

8 years agoMerge pull request #700 from brunodoamaral/patch-1
David Lord [Wed, 5 Apr 2017 14:26:08 +0000 (07:26 -0700)] 
Merge pull request #700 from brunodoamaral/patch-1

Fixed incorrect merge in setup.py

8 years agoFixed incorrect merge in setup.py 700/head
Bruno Guberfain do Amaral [Wed, 5 Apr 2017 14:01:25 +0000 (11:01 -0300)] 
Fixed incorrect merge in setup.py

I just don't know if the correct version is 2.9.7.dev or 2.10.dev

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Mon, 3 Apr 2017 13:12:19 +0000 (15:12 +0200)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Mon, 3 Apr 2017 13:12:08 +0000 (15:12 +0200)] 
Merge branch '2.9-maintenance'

8 years ago2.9.7-dev
Armin Ronacher [Mon, 3 Apr 2017 13:11:44 +0000 (15:11 +0200)] 
2.9.7-dev

8 years agoBump version number to 2.9.6 2.9.6
Armin Ronacher [Mon, 3 Apr 2017 13:11:27 +0000 (15:11 +0200)] 
Bump version number to 2.9.6

8 years agoUpdated release command
Armin Ronacher [Mon, 3 Apr 2017 13:11:09 +0000 (15:11 +0200)] 
Updated release command

8 years agoSet release date
Armin Ronacher [Mon, 3 Apr 2017 13:08:43 +0000 (15:08 +0200)] 
Set release date

8 years agoMerge pull request #693 from tedder/multiple_argument_select_documentation
David Lord [Fri, 17 Mar 2017 21:23:18 +0000 (14:23 -0700)] 
Merge pull request #693 from tedder/multiple_argument_select_documentation

add examples showing > 1 argument in filter