]>
git.ipfire.org Git - thirdparty/jinja.git/log
ngr [Mon, 14 May 2018 15:20:32 +0000 (11:20 -0400)]
remove html+jinja highlight
David Lord [Thu, 19 Apr 2018 02:40:50 +0000 (19:40 -0700)]
Merge pull request #841 from jdufresne/pypi
Update all pypi.python.org URLs to pypi.org
Jon Dufresne [Thu, 19 Apr 2018 02:35:29 +0000 (19:35 -0700)]
Update all pypi.python.org URLs to pypi.org
For details on the new PyPI, see the blog post:
https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
David Lord [Tue, 17 Apr 2018 23:51:24 +0000 (16:51 -0700)]
Merge pull request #840 from nwalsh1995/master
Fix small typo in docs/api.rst
nwalsh1995 [Tue, 17 Apr 2018 21:55:13 +0000 (14:55 -0700)]
Fix small typo
Armin Ronacher [Wed, 28 Mar 2018 21:31:03 +0000 (23:31 +0200)]
Remove old GPL licensed emacs support
This is unmaintained anyways and we do not want to ship non BSD code.
Fixes #833
David Lord [Thu, 22 Mar 2018 18:59:02 +0000 (11:59 -0700)]
Merge pull request #826 from terminalmage/issue823
Fix escaped characters in indent filter
Erik Johnson [Tue, 20 Mar 2018 02:56:54 +0000 (21:56 -0500)]
Remove unescape method for fixing concatenation issue
This ensures that we only concatenate Markup instances to other Markup
instances.
Erik Johnson [Mon, 19 Mar 2018 21:03:29 +0000 (16:03 -0500)]
Add .pytest_cache/ to gitignore
Erik Johnson [Mon, 19 Mar 2018 21:03:00 +0000 (16:03 -0500)]
Apply unesacpe fix when blank is True
Erik Johnson [Mon, 19 Mar 2018 19:30:46 +0000 (14:30 -0500)]
Fix spelling in docstring
Erik Johnson [Mon, 19 Mar 2018 19:18:27 +0000 (14:18 -0500)]
Add test cases for quotes and expand coverage to include Markup input
Erik Johnson [Mon, 19 Mar 2018 19:17:35 +0000 (14:17 -0500)]
Fix cases where filter input is not a Markup type
The previous commit assumes that the filter will always be a Markup
type, which is not correct.
Erik Johnson [Mon, 19 Mar 2018 18:27:38 +0000 (13:27 -0500)]
Fix escaped characters in indent filter
This unescapes after concatenating, to fix a bug introduced in Jinja
2.10 where lines concatenated contain escaped versions of non-ascii
characters.
Sean Sabbage [Mon, 19 Mar 2018 14:05:42 +0000 (14:05 +0000)]
Correct documentation for min method (#825)
David Lord [Mon, 5 Mar 2018 14:23:40 +0000 (06:23 -0800)]
Merge pull request #820 from jdufresne/typo
Fix typo: apparenlty -> apparently.
Jon Dufresne [Sun, 4 Mar 2018 20:15:52 +0000 (12:15 -0800)]
Fix typo: apparenlty -> apparently.
luzpaz [Sun, 18 Feb 2018 14:57:01 +0000 (09:57 -0500)]
Fix typos (#815)
Found via `codespell -q 3` using v1.12.0.dev0
David Lord [Tue, 6 Feb 2018 15:52:32 +0000 (07:52 -0800)]
Merge pull request #806 from methane/lazy-async-patch
Lazy asyncsupport.patch_all()
David Lord [Tue, 6 Feb 2018 15:48:10 +0000 (07:48 -0800)]
add changelog
fix unrelated docs issue
INADA Naoki [Tue, 6 Feb 2018 12:52:57 +0000 (21:52 +0900)]
Lazy asyncsupport.patch_all()
fixes #765
Godefroid Chapelle [Tue, 30 Jan 2018 20:02:33 +0000 (21:02 +0100)]
Remove old statement about Python 3 (#803)
There is now Python 3 support...
David Lord [Tue, 23 Jan 2018 16:31:30 +0000 (08:31 -0800)]
Merge pull request #799 from mkrizek/native-concat-list
Allow to pass a list to native_concat
David Lord [Thu, 18 Jan 2018 16:56:55 +0000 (08:56 -0800)]
fix code block markup
closes #800
Martin Krizek [Wed, 17 Jan 2018 22:09:23 +0000 (23:09 +0100)]
Don't check for generator if not needed
Martin Krizek [Wed, 17 Jan 2018 20:38:58 +0000 (21:38 +0100)]
Allow to pass a list to native_concat
David Lord [Fri, 1 Dec 2017 18:27:13 +0000 (10:27 -0800)]
Merge pull request #787 from SabujXi/patch-1
Fix typo instanciable > instantiable
Md. Sabuj Sarker [Fri, 1 Dec 2017 18:10:39 +0000 (00:10 +0600)]
Fix typo instanciable > instantiable
David Lord [Thu, 9 Nov 2017 01:21:47 +0000 (18:21 -0700)]
Merge pull request #783 from luzpaz/trivial-typos
Trivial typos
Unknown [Thu, 9 Nov 2017 01:02:28 +0000 (20:02 -0500)]
Trivial typos
Most non-user facing.
David Lord [Wed, 8 Nov 2017 20:01:29 +0000 (12:01 -0800)]
Bump version number to 2.11.dev
David Lord [Wed, 8 Nov 2017 19:58:35 +0000 (11:58 -0800)]
Bump version number to 2.10
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
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
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.
David Lord [Tue, 31 Oct 2017 15:51:53 +0000 (08:51 -0700)]
Merge branch 'master' into NATIVE_TYPES
Ricardo Lafuente [Mon, 16 Oct 2017 11:11:44 +0000 (12:11 +0100)]
Fix typo in docstring (#779)
David Lord [Sun, 8 Oct 2017 20:15:09 +0000 (13:15 -0700)]
codecov needs argparse on 2.6
Eli Boyarski [Mon, 18 Sep 2017 14:24:38 +0000 (17:24 +0300)]
Minor docstring grammar fix (#772)
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
Adrian Moennich [Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)]
Merge branch '2.9-maintenance'
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
Armin Ronacher [Wed, 9 Aug 2017 07:07:04 +0000 (09:07 +0200)]
Merge branch '2.9-maintenance'
Armin Ronacher [Wed, 9 Aug 2017 07:06:39 +0000 (09:06 +0200)]
Added a changelog entry
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")
James Tanner [Wed, 26 Jul 2017 02:11:22 +0000 (22:11 -0400)]
quickly fix py3 tests
James Tanner [Wed, 26 Jul 2017 01:48:12 +0000 (21:48 -0400)]
Add requested patch for safe_repr and nodes.Impossible
Adrian [Fri, 14 Jul 2017 15:19:17 +0000 (17:19 +0200)]
Merge branch 'master' into NATIVE_TYPES
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
David Lord [Sun, 9 Jul 2017 15:39:25 +0000 (08:39 -0700)]
rewrite tests to match usage
Alex Kahan [Fri, 27 Jan 2017 18:13:12 +0000 (13:13 -0500)]
Adds tests for the memcached bytecode cache module
David Lord [Sat, 8 Jul 2017 16:10:33 +0000 (09:10 -0700)]
Merge pull request #692 from dnmvisser/dictsort_reverse
Dictsort reverse
David Lord [Sat, 8 Jul 2017 16:04:29 +0000 (09:04 -0700)]
add test and changelog
use ignore_case function
Dick Visser [Thu, 9 Mar 2017 20:37:42 +0000 (21:37 +0100)]
'reverse' option for dictsort
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__
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
David Lord [Fri, 7 Jul 2017 18:46:19 +0000 (11:46 -0700)]
shorten arguments
add test for single line
update changelog
Francisco Jiménez Cabrera [Wed, 1 Mar 2017 23:10:29 +0000 (00:10 +0100)]
Ignore empty lines in indent filter
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"
David Lord [Fri, 7 Jul 2017 16:51:31 +0000 (09:51 -0700)]
add test and changelog
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.
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 ..."
David Lord [Fri, 7 Jul 2017 16:34:32 +0000 (09:34 -0700)]
add tests and changelog
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.
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
Sebastian Noack [Mon, 10 Aug 2015 07:51:36 +0000 (09:51 +0200)]
Inline template tests during optimization
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".
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
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
David Lord [Thu, 6 Jul 2017 18:15:37 +0000 (11:15 -0700)]
Merge pull request #738 from davidism/test-config
Standard test config
David Lord [Thu, 6 Jul 2017 18:07:02 +0000 (11:07 -0700)]
standard test configuration
add branch coverage and codecov
David Lord [Thu, 6 Jul 2017 17:43:21 +0000 (10:43 -0700)]
fix docs warnings
David Lord [Thu, 6 Jul 2017 17:41:46 +0000 (10:41 -0700)]
remove test copied from markupsafe
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
David Lord [Thu, 6 Jul 2017 15:37:17 +0000 (08:37 -0700)]
parametrize tests
argument order consistent with existing filters
add changelog
Sebastian Noack [Tue, 4 Aug 2015 20:11:55 +0000 (22:11 +0200)]
Added min and max filters
David Lord [Wed, 5 Jul 2017 21:27:45 +0000 (14:27 -0700)]
Merge pull request #735 from davidism/unique-filter
Unique filter
David Lord [Wed, 5 Jul 2017 21:22:27 +0000 (14:22 -0700)]
make attrgetter take generic postprocess function
add changelog
David Lord [Wed, 5 Jul 2017 18:58:34 +0000 (11:58 -0700)]
Merge branch 'master' into unique-filter
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
David Lord [Wed, 5 Jul 2017 18:17:09 +0000 (11:17 -0700)]
fix random test for py2
add changelog
David Lord [Wed, 5 Jul 2017 18:09:24 +0000 (11:09 -0700)]
test compares random filter to random call with same seed
David Lord [Wed, 5 Jul 2017 17:11:00 +0000 (10:11 -0700)]
Merge branch 'master' into dont-inline-random
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
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
David Lord [Mon, 3 Jul 2017 16:40:07 +0000 (09:40 -0700)]
remove unnecessary \b from name regex
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
David Lord [Sun, 2 Jul 2017 16:37:57 +0000 (09:37 -0700)]
switch back to unicode escapes
David Lord [Sun, 2 Jul 2017 16:30:41 +0000 (09:30 -0700)]
fix unicode for py2
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
David Lord [Sun, 2 Jul 2017 16:18:20 +0000 (09:18 -0700)]
test for new identifier lexer
currently fails on special case unicode
Armin Ronacher [Sat, 1 Jul 2017 22:30:25 +0000 (00:30 +0200)]
Added missing identifiers to the name re
Armin Ronacher [Sat, 1 Jul 2017 21:29:23 +0000 (23:29 +0200)]
Inversed invalid logic
Armin Ronacher [Sat, 1 Jul 2017 18:41:24 +0000 (20:41 +0200)]
Use str.isidentifier to match idents on python 3
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
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
Adrian Moennich [Sun, 26 Feb 2017 17:00:06 +0000 (18:00 +0100)]
Add docs for namespace functionality
Adrian Moennich [Sun, 26 Feb 2017 16:28:47 +0000 (17:28 +0100)]
Add unit tests for namespace functionality
Adrian Moennich [Sun, 26 Feb 2017 15:45:54 +0000 (16:45 +0100)]
Add support for namespace attribute assignment
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