]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
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 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 #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

8 years agoadd examples showing > 1 argument in filter 693/head
tedder [Fri, 17 Mar 2017 20:15:12 +0000 (13:15 -0700)] 
add examples showing > 1 argument in filter

This is implied but poorly documented. A few examples make it clear.

8 years agoFix custom contexts in fast resolve mode
Adrian Moennich [Wed, 15 Mar 2017 18:19:04 +0000 (19:19 +0100)] 
Fix custom contexts in fast resolve mode

closes #675

8 years agoFix typo (#687)
Daniel van Flymen [Wed, 1 Mar 2017 19:10:34 +0000 (14:10 -0500)] 
Fix typo (#687)

8 years agoUse proper `versionadded` annotation in docs
Adrian Moennich [Sun, 26 Feb 2017 17:01:59 +0000 (18:01 +0100)] 
Use proper `versionadded` annotation in docs

8 years agobdist_wheel replaces wheel
Jeff Widman [Sat, 11 Feb 2017 07:12:14 +0000 (23:12 -0800)] 
bdist_wheel replaces wheel

https://packaging.python.org/distributing/#universal-wheels

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 28 Jan 2017 14:44:17 +0000 (15:44 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.6-dev
Armin Ronacher [Sat, 28 Jan 2017 14:43:46 +0000 (15:43 +0100)] 
2.9.6-dev

8 years agoBump version number to 2.9.5 2.9.5
Armin Ronacher [Sat, 28 Jan 2017 14:42:29 +0000 (15:42 +0100)] 
Bump version number to 2.9.5

8 years agoSet date for 2.9.5
Armin Ronacher [Sat, 28 Jan 2017 14:42:19 +0000 (15:42 +0100)] 
Set date for 2.9.5

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Sat, 28 Jan 2017 14:34:25 +0000 (15:34 +0100)] 
Merge branch '2.9-maintenance'

8 years agoFixed async macro autoescape. Fixes #671
Armin Ronacher [Sat, 28 Jan 2017 14:33:09 +0000 (15:33 +0100)] 
Fixed async macro autoescape. Fixes #671

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:49:51 +0000 (20:49 +0100)] 
Merge branch '2.9-maintenance'

8 years agoReduce unused unicodedata dump. Fixes #666
Armin Ronacher [Tue, 24 Jan 2017 19:49:43 +0000 (20:49 +0100)] 
Reduce unused unicodedata dump. Fixes #666

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:22:27 +0000 (20:22 +0100)] 
Merge branch '2.9-maintenance'

8 years agoResolved extends errors in async mode (Fixes #668)
Armin Ronacher [Tue, 24 Jan 2017 19:22:19 +0000 (20:22 +0100)] 
Resolved extends errors in async mode (Fixes #668)

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 24 Jan 2017 19:16:20 +0000 (20:16 +0100)] 
Merge branch '2.9-maintenance'

8 years agoCorrectly use buffer for else frame in loops. Fixes #669
Armin Ronacher [Tue, 24 Jan 2017 19:16:02 +0000 (20:16 +0100)] 
Correctly use buffer for else frame in loops. Fixes #669

8 years agoMerge branch '2.9-maintenance'
Markus Unterwaditzer [Tue, 24 Jan 2017 15:36:16 +0000 (16:36 +0100)] 
Merge branch '2.9-maintenance'

8 years agofix failing tests: removed some broken code (#661)
Andrew Arendt [Thu, 12 Jan 2017 18:46:05 +0000 (12:46 -0600)] 
fix failing tests: removed some broken code (#661)

8 years agoAdded changelog entry for #658
Armin Ronacher [Thu, 12 Jan 2017 22:50:08 +0000 (23:50 +0100)] 
Added changelog entry for #658

8 years agoAdd "is in" containment test (#658)
Dirk D [Thu, 12 Jan 2017 21:03:38 +0000 (22:03 +0100)] 
Add "is in" containment test (#658)

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 19:11:00 +0000 (20:11 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdd support back for custom resolves on old resolve method
Armin Ronacher [Thu, 12 Jan 2017 19:10:58 +0000 (20:10 +0100)] 
Add support back for custom resolves on old resolve method

8 years agofix failing tests: removed some broken code (#661)
Andrew Arendt [Thu, 12 Jan 2017 18:46:05 +0000 (12:46 -0600)] 
fix failing tests: removed some broken code (#661)

8 years agoMerge branch '2.9-maintenance' 630/head
Armin Ronacher [Thu, 12 Jan 2017 15:00:17 +0000 (16:00 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a note for #657
Armin Ronacher [Thu, 12 Jan 2017 15:00:02 +0000 (16:00 +0100)] 
Added a note for #657

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:55:29 +0000 (15:55 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAlso restore original str method
Armin Ronacher [Thu, 12 Jan 2017 14:55:20 +0000 (15:55 +0100)] 
Also restore original str method

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:53:36 +0000 (15:53 +0100)] 
Merge branch '2.9-maintenance'

8 years agoRestore original tuple repr for grouper. Fixes #654
Armin Ronacher [Thu, 12 Jan 2017 14:53:09 +0000 (15:53 +0100)] 
Restore original tuple repr for grouper.  Fixes #654

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:47:26 +0000 (15:47 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a note on loop scoping
Armin Ronacher [Thu, 12 Jan 2017 14:47:18 +0000 (15:47 +0100)] 
Added a note on loop scoping

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:43:39 +0000 (15:43 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded another regression test for ansible/ansible#20063
Armin Ronacher [Thu, 12 Jan 2017 14:43:31 +0000 (15:43 +0100)] 
Added another regression test for ansible/ansible#20063

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Thu, 12 Jan 2017 14:38:38 +0000 (15:38 +0100)] 
Merge branch '2.9-maintenance'

8 years agoAdded a test for an assumed regression (refs #659)
Armin Ronacher [Thu, 12 Jan 2017 14:38:31 +0000 (15:38 +0100)] 
Added a test for an assumed regression (refs #659)

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 10 Jan 2017 08:24:55 +0000 (09:24 +0100)] 
Merge branch '2.9-maintenance'

8 years ago2.9.5-dev
Armin Ronacher [Tue, 10 Jan 2017 08:24:24 +0000 (09:24 +0100)] 
2.9.5-dev

8 years agoBump version number to 2.9.4 2.9.4
Armin Ronacher [Tue, 10 Jan 2017 08:24:10 +0000 (09:24 +0100)] 
Bump version number to 2.9.4

8 years ago2.9.4
Armin Ronacher [Tue, 10 Jan 2017 08:23:55 +0000 (09:23 +0100)] 
2.9.4

8 years agoMerge branch 'master' of github.com:pallets/jinja
Armin Ronacher [Tue, 10 Jan 2017 08:21:57 +0000 (09:21 +0100)] 
Merge branch 'master' of github.com:pallets/jinja

8 years agoMerge branch '2.9-maintenance'
Armin Ronacher [Tue, 10 Jan 2017 08:21:45 +0000 (09:21 +0100)] 
Merge branch '2.9-maintenance'