]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
5 years agofixing LoopContext, loops indexing and iterator length property 993/head
aayushuppal [Mon, 6 May 2019 21:17:43 +0000 (17:17 -0400)] 
fixing LoopContext, loops indexing and iterator length property

5 years agoreformat changelog
David Lord [Mon, 14 Oct 2019 14:03:03 +0000 (07:03 -0700)] 
reformat changelog

5 years agoMerge pull request #1079 from ThiefMaster/cond-expr-undefined
David Lord [Sun, 13 Oct 2019 17:00:36 +0000 (10:00 -0700)] 
Merge pull request #1079 from ThiefMaster/cond-expr-undefined

Use separate undefined object for else-less conditional expressions

5 years agoDon't make cond_expr_undefined configurable 1079/head
Adrian Moennich [Sun, 13 Oct 2019 14:54:00 +0000 (16:54 +0200)] 
Don't make cond_expr_undefined configurable

5 years agoUse separate undefined object for CondExpr
Adrian Moennich [Sat, 12 Oct 2019 14:18:34 +0000 (16:18 +0200)] 
Use separate undefined object for CondExpr

5 years agoMerge pull request #1081 from pallets/open-if-exists
David Lord [Sun, 13 Oct 2019 13:48:54 +0000 (06:48 -0700)] 
Merge pull request #1081 from pallets/open-if-exists

skip template with same name as directory

5 years agoskip template with same name as directory 1081/head
David Lord [Sun, 13 Oct 2019 13:40:54 +0000 (06:40 -0700)] 
skip template with same name as directory

When using multiple paths with FileSystemLoader, a template with the
same name as a directory will not prevent loading a template in the
directory.

5 years agoMerge pull request #1080 from pallets/no-finalize-template-data
David Lord [Sun, 13 Oct 2019 04:34:11 +0000 (21:34 -0700)] 
Merge pull request #1080 from pallets/no-finalize-template-data

don't finalize TemplateData nodes

5 years agodon't finalize TemplateData nodes 1080/head
David Lord [Sun, 13 Oct 2019 04:04:31 +0000 (21:04 -0700)] 
don't finalize TemplateData nodes

Finalize only applies to the output of expressions (constant or not).
Add tests for context, eval, and env finalize functions.

5 years agoconsistent use of token constants
David Lord [Thu, 10 Oct 2019 15:50:20 +0000 (08:50 -0700)] 
consistent use of token constants

5 years agoMerge pull request #1077 from pallets/pytest-cleanup
David Lord [Thu, 10 Oct 2019 14:14:15 +0000 (07:14 -0700)] 
Merge pull request #1077 from pallets/pytest-cleanup

Pytest cleanup

5 years agofix invalid double extends test 1077/head
David Lord [Thu, 10 Oct 2019 13:57:04 +0000 (06:57 -0700)] 
fix invalid double extends test

5 years agoReplaced try...catch within tests with pytest.raises
Kevin Brown [Thu, 10 Oct 2019 06:15:15 +0000 (02:15 -0400)] 
Replaced try...catch within tests with pytest.raises

This still leaves one in test_debug which relies on reading out
the traceback and cannot easily be replaced by pytest.raises
like the others.

5 years agoMerge pull request #824 from dagwieers/new-type-tests
David Lord [Thu, 10 Oct 2019 03:09:42 +0000 (20:09 -0700)] 
Merge pull request #824 from dagwieers/new-type-tests

Add more strict type tests

5 years agoAdd more strict type tests 824/head
Dag Wieers [Sat, 17 Mar 2018 03:00:11 +0000 (04:00 +0100)] 
Add more strict type tests

This PR adds a few more type-related tests.

- boolean
    Testing of an object is a boolean required 2 tests.

- false
    Make this similar to testing none value

- true
    Make this similar to testing none value

- integer
    The existing 'number' test does not make a distinction between
    integer, float or even booleans

- float
    The existing 'number' test does not make a distinction between
    integer, float or even booleans

5 years agoMerge pull request #1073 from brtomas0/master
David Lord [Wed, 9 Oct 2019 23:38:54 +0000 (16:38 -0700)] 
Merge pull request #1073 from brtomas0/master

changed test_join functions to unique names

5 years agochanged test_join functions to unique names 1073/head
Brandon Tomás [Wed, 9 Oct 2019 23:14:03 +0000 (19:14 -0400)] 
changed test_join functions to unique names

5 years agouse slots for lexer lstrip marker
David Lord [Mon, 7 Oct 2019 17:11:00 +0000 (10:11 -0700)] 
use slots for lexer lstrip marker

5 years agoadd changelog for #938
David Lord [Mon, 7 Oct 2019 14:42:04 +0000 (07:42 -0700)] 
add changelog for #938

5 years agoMerge pull request #938 from stevenorum/master
David Lord [Mon, 7 Oct 2019 13:55:32 +0000 (06:55 -0700)] 
Merge pull request #938 from stevenorum/master

Fixing compiler handling of parens around boolean comparisons.

5 years agoadd changelog for #858
David Lord [Mon, 7 Oct 2019 06:42:36 +0000 (23:42 -0700)] 
add changelog for #858

5 years agoMerge pull request #858 from exponea/857-lexer-whitespace-performance
David Lord [Mon, 7 Oct 2019 06:41:04 +0000 (23:41 -0700)] 
Merge pull request #858 from exponea/857-lexer-whitespace-performance

Fix lexer being extremely slow on large amounts of whitespace. Fixes #857

5 years agoadd comments about lstrip code 858/head
David Lord [Mon, 7 Oct 2019 06:37:16 +0000 (23:37 -0700)] 
add comments about lstrip code

5 years agoMerge branch 'master' into 857-lexer-whitespace-performance
David Lord [Mon, 7 Oct 2019 06:28:18 +0000 (23:28 -0700)] 
Merge branch 'master' into 857-lexer-whitespace-performance

5 years agoMerge pull request #1071 from btharper/pytest-raises
David Lord [Sun, 6 Oct 2019 04:20:38 +0000 (21:20 -0700)] 
Merge pull request #1071 from btharper/pytest-raises

Eliminate dead code by using pytests.raises instead of try/except/else

5 years agoEliminate dead code by using pytests.raises instead of try/except/else 1071/head
btharper [Sun, 6 Oct 2019 04:00:24 +0000 (00:00 -0400)] 
Eliminate dead code by using pytests.raises instead of try/except/else

5 years agoMerge pull request #983 from kevin-brown/pr/798
David Lord [Sat, 5 Oct 2019 02:17:41 +0000 (19:17 -0700)] 
Merge pull request #983 from kevin-brown/pr/798

Add support for a {% debug %} extension tag.

5 years agodocument debug extension 983/head
David Lord [Sat, 5 Oct 2019 02:00:11 +0000 (19:00 -0700)] 
document debug extension

5 years agodon't bypass autoescape
David Lord [Sat, 5 Oct 2019 01:23:11 +0000 (18:23 -0700)] 
don't bypass autoescape

5 years agoAdd support for a {% debug %} extension tag.
Shaheed Haque [Sun, 14 Jan 2018 14:01:22 +0000 (14:01 +0000)] 
Add support for a {% debug %} extension tag.
This dumps the available variables, filters and tests.

5 years agoMerge pull request #1047 from lfdebrux/ldeb-bug-chainable_undefined_and_markup
David Lord [Fri, 4 Oct 2019 20:11:20 +0000 (13:11 -0700)] 
Merge pull request #1047 from lfdebrux/ldeb-bug-chainable_undefined_and_markup

Fix bug with when using Markup on ChainableUndefined

5 years agoFix bug with when using Markup on ChainableUndefined 1047/head
Laurence de Bruxelles [Sat, 10 Aug 2019 21:08:39 +0000 (22:08 +0100)] 
Fix bug with when using Markup on ChainableUndefined

Wrapping a ChainableUndefined object with Markup causes an
UndefinedError because Markup thinks that ChainableUndefined has an
attribute called __html__ and tries to call it.

This commit fixes this by defining a method __html__ that calls
ChainableUndefined.__str__. We also add a regression test.

5 years agoMerge branch '2.10.x'
David Lord [Fri, 4 Oct 2019 19:53:44 +0000 (12:53 -0700)] 
Merge branch '2.10.x'

5 years agoMerge pull request #1070 from anowlcalledjosh/develop
David Lord [Fri, 4 Oct 2019 19:51:47 +0000 (12:51 -0700)] 
Merge pull request #1070 from anowlcalledjosh/develop

Fix incorrect release date for 2.10.3

5 years agoFix incorrect release date for 2.10.3 1070/head
Josh Holland [Fri, 4 Oct 2019 19:38:17 +0000 (20:38 +0100)] 
Fix incorrect release date for 2.10.3

5 years agoMerge pull request #828 from chamini2/trim-more
David Lord [Fri, 4 Oct 2019 19:01:37 +0000 (12:01 -0700)] 
Merge pull request #828 from chamini2/trim-more

Add chars option to trim

5 years agoMerge branch '2.10.x'
David Lord [Fri, 4 Oct 2019 18:59:18 +0000 (11:59 -0700)] 
Merge branch '2.10.x'

5 years agorelease version 2.10.3 2.10.3
David Lord [Fri, 4 Oct 2019 18:50:02 +0000 (11:50 -0700)] 
release version 2.10.3

5 years agoFix typo in setup.py
Adrian [Fri, 4 Oct 2019 18:46:10 +0000 (20:46 +0200)] 
Fix typo in setup.py

5 years agoadd chars option to trim 828/head
Matteo Ferrando [Wed, 21 Mar 2018 16:47:46 +0000 (12:47 -0400)] 
add chars option to trim

5 years agoMerge branch '2.10.x'
David Lord [Fri, 4 Oct 2019 18:22:50 +0000 (11:22 -0700)] 
Merge branch '2.10.x'

5 years agorelease version 2.10.2 2.10.2
David Lord [Fri, 4 Oct 2019 18:18:56 +0000 (11:18 -0700)] 
release version 2.10.2

5 years agoupdate project metadata
David Lord [Fri, 4 Oct 2019 18:17:12 +0000 (11:17 -0700)] 
update project metadata

5 years agoMerge pull request #1000 from EtiennePelletier/fix_deadlock_improve_tests
David Lord [Fri, 4 Oct 2019 15:30:39 +0000 (08:30 -0700)] 
Merge pull request #1000 from EtiennePelletier/fix_deadlock_improve_tests

Fix deadlock in LRUCache and improve test coverage

5 years agoAdd tests for Undefined classes 1000/head
EtiennePelletier [Thu, 9 May 2019 20:50:47 +0000 (16:50 -0400)] 
Add tests for Undefined classes

5 years agoAdd tests for utils.py - LRUCache, Lorem Ipsum & +
EtiennePelletier [Thu, 9 May 2019 20:49:50 +0000 (16:49 -0400)] 
Add tests for utils.py - LRUCache, Lorem Ipsum & +

5 years agoPrevent deadlock in LRUCache.setdefault
EtiennePelletier [Thu, 9 May 2019 20:47:54 +0000 (16:47 -0400)] 
Prevent deadlock in LRUCache.setdefault

setdefault was acquiring write_lock, then calling getitem and also
potentially setitem, which also both try to acquire the write lock.

5 years agoMerge pull request #1040 from minho42/Simplify-import-split
David Lord [Fri, 4 Oct 2019 14:42:43 +0000 (07:42 -0700)] 
Merge pull request #1040 from minho42/Simplify-import-split

Simplify splitting import_name in import_string()

5 years agoMerge pull request #1065 from alexwlchan/add-pypi-links
Joshua Bronson [Sun, 22 Sep 2019 19:29:08 +0000 (15:29 -0400)] 
Merge pull request #1065 from alexwlchan/add-pypi-links

Add docs, code and issue tracker links to setup.py

5 years agoAdd docs, code and issue tracker links to setup.py 1065/head
Alex Chan [Sun, 22 Sep 2019 08:52:15 +0000 (09:52 +0100)] 
Add docs, code and issue tracker links to setup.py

5 years agoMerge pull request #1063 from PikachuEXE/fix/manifest
Joshua Bronson [Fri, 20 Sep 2019 02:28:44 +0000 (22:28 -0400)] 
Merge pull request #1063 from PikachuEXE/fix/manifest

Fix MANIFEST.in to include renamed license file

5 years agoFix MANIFEST.in to include renamed license file 1063/head
PikachuEXE [Fri, 20 Sep 2019 02:16:11 +0000 (10:16 +0800)] 
Fix MANIFEST.in to include renamed license file

5 years agoFix simple typo: problemtic -> problematic (#1059)
Tim Gates [Wed, 4 Sep 2019 22:12:07 +0000 (08:12 +1000)] 
Fix simple typo: problemtic -> problematic (#1059)

Plus rephrase the comment for greater clarity.

5 years agoMerge branch '2.10.x'
David Lord [Wed, 4 Sep 2019 15:25:09 +0000 (08:25 -0700)] 
Merge branch '2.10.x'

5 years agoMerge pull request #1051 from vstinner/tb_next_py37
David Lord [Wed, 4 Sep 2019 14:48:06 +0000 (07:48 -0700)] 
Merge pull request #1051 from vstinner/tb_next_py37

Fix TracebackFrameProxy.set_next() on Python 3.7

5 years agoFix TracebackFrameProxy.set_next() on Python 3.7 1051/head
Victor Stinner [Mon, 19 Aug 2019 22:40:39 +0000 (00:40 +0200)] 
Fix TracebackFrameProxy.set_next() on Python 3.7

Fix issue #1050: fix a crash in TracebackFrameProxy.set_next() on
Python 3.7 and newer, when Python is build in debug mode.

Since Python 3.7, traceback.tb_next field can be modified: ctypes is
no longer needed.

5 years agoMerge pull request #1045 from yuriks/patch-1
Joshua Bronson [Fri, 9 Aug 2019 02:49:09 +0000 (22:49 -0400)] 
Merge pull request #1045 from yuriks/patch-1

Update PyPI link to point to Jinja2 instead of 1

5 years agoUpdate PyPI link to point to Jinja2 instead of 1 1045/head
Yuri Kunde Schlesner [Fri, 9 Aug 2019 00:14:03 +0000 (17:14 -0700)] 
Update PyPI link to point to Jinja2 instead of 1

6 years agoMerge branch '2.10.x'
David Lord [Fri, 26 Jul 2019 22:21:16 +0000 (15:21 -0700)] 
Merge branch '2.10.x'

6 years agofix tox docs build
David Lord [Fri, 26 Jul 2019 22:17:58 +0000 (15:17 -0700)] 
fix tox docs build

6 years agoMerge branch '2.9.x' into docs
David Lord [Fri, 26 Jul 2019 21:57:58 +0000 (14:57 -0700)] 
Merge branch '2.9.x' into docs

6 years agoMerge pull request #1042 from pallets/docs
David Lord [Fri, 26 Jul 2019 21:39:59 +0000 (14:39 -0700)] 
Merge pull request #1042 from pallets/docs

modernize docs, 2.9.x branch

6 years agoreformat readme 1042/head
David Lord [Fri, 26 Jul 2019 21:36:55 +0000 (14:36 -0700)] 
reformat readme

6 years agofix linkcheck issues
David Lord [Fri, 26 Jul 2019 19:12:41 +0000 (12:12 -0700)] 
fix linkcheck issues

6 years agomodernize docs config, use pallets-sphinx-themes
David Lord [Wed, 24 Jul 2019 21:18:02 +0000 (14:18 -0700)] 
modernize docs config, use pallets-sphinx-themes

6 years agoFix typo
Min ho Kim [Thu, 25 Jul 2019 13:28:26 +0000 (23:28 +1000)] 
Fix typo

6 years agoSimplify splitting import_name in import_string() 1040/head
Min ho Kim [Tue, 23 Jul 2019 23:55:04 +0000 (09:55 +1000)] 
Simplify splitting import_name in import_string()

6 years agoMerge pull request #1035 from utoddl/stable-sort-doc
David Lord [Tue, 23 Jul 2019 22:23:03 +0000 (15:23 -0700)] 
Merge pull request #1035 from utoddl/stable-sort-doc

document that sort is stable

6 years agoclean up sort filter docs 1035/head
David Lord [Tue, 23 Jul 2019 22:20:07 +0000 (15:20 -0700)] 
clean up sort filter docs

6 years agodocument that sort is stable
Todd Lewis [Thu, 18 Jul 2019 12:21:34 +0000 (08:21 -0400)] 
document that sort is stable

6 years agoMerge pull request #956 from revelt/patch-1
David Lord [Tue, 23 Jul 2019 21:54:57 +0000 (14:54 -0700)] 
Merge pull request #956 from revelt/patch-1

Tweak docs grouper chapter

6 years agoclean up groupby filter docs 956/head
David Lord [Tue, 23 Jul 2019 21:48:41 +0000 (14:48 -0700)] 
clean up groupby filter docs

6 years agoclarify groupby behavior in docs
Roy Revelt [Sat, 9 Mar 2019 11:23:39 +0000 (11:23 +0000)] 
clarify groupby behavior in docs

6 years agoMerge pull request #923 from CleoQc/feature/long_integer_with_underscores
David Lord [Tue, 23 Jul 2019 18:11:28 +0000 (11:11 -0700)] 
Merge pull request #923 from CleoQc/feature/long_integer_with_underscores

Feature/long integer with underscores

6 years agoclean up numeric underscore support 923/head
David Lord [Tue, 23 Jul 2019 18:07:09 +0000 (11:07 -0700)] 
clean up numeric underscore support

add changelog
clean up docs
parametrize tests
explain float regex

6 years agosupport underscore in int and float
CleoQc [Tue, 13 Nov 2018 00:43:13 +0000 (19:43 -0500)] 
support underscore in int and float

6 years agoMerge pull request #922 from CleoQc/feature/support_scientific_notation
David Lord [Tue, 23 Jul 2019 15:35:15 +0000 (08:35 -0700)] 
Merge pull request #922 from CleoQc/feature/support_scientific_notation

Feature/support scientific notation

6 years agoclean up scientific notation support 922/head
David Lord [Tue, 23 Jul 2019 15:19:51 +0000 (08:19 -0700)] 
clean up scientific notation support

add changelog
clean up docs
parametrize tests

6 years agosupport scientific notation
CleoQc [Mon, 12 Nov 2018 18:56:41 +0000 (13:56 -0500)] 
support scientific notation

6 years agoMerge pull request #961 from JulienPalard/TemplateNotFound
David Lord [Mon, 22 Jul 2019 17:50:37 +0000 (10:50 -0700)] 
Merge pull request #961 from JulienPalard/TemplateNotFound

Better repr for TemplateNotFound.

6 years agoMerge pull request #981 from pwlandoll/2.10.x
David Lord [Mon, 22 Jul 2019 17:47:32 +0000 (10:47 -0700)] 
Merge pull request #981 from pwlandoll/2.10.x

Add Links section to README

6 years agoMerge pull request #994 from bkiu/931-undeclared-variables
David Lord [Mon, 22 Jul 2019 17:46:50 +0000 (10:46 -0700)] 
Merge pull request #994 from bkiu/931-undeclared-variables

exclude globals from find_undeclared_variables

6 years agoexclude globals from find_undeclared_variables 994/head
Brendan [Tue, 7 May 2019 16:00:06 +0000 (12:00 -0400)] 
exclude globals from find_undeclared_variables

6 years agoMerge pull request #985 from bkiu/557-map-default
David Lord [Mon, 22 Jul 2019 17:39:23 +0000 (10:39 -0700)] 
Merge pull request #985 from bkiu/557-map-default

Adding a default parameter to builtin map filter

6 years agoMerge branch 'master' into 557-map-default 985/head
David Lord [Mon, 22 Jul 2019 16:45:20 +0000 (09:45 -0700)] 
Merge branch 'master' into 557-map-default

6 years agoAdding a default parameter to builtin map filter
Brendan [Mon, 6 May 2019 15:49:48 +0000 (11:49 -0400)] 
Adding a default parameter to builtin map filter

6 years agoMerge pull request #986 from pbjr23/fix-safe-range-memory
David Lord [Mon, 22 Jul 2019 15:34:09 +0000 (08:34 -0700)] 
Merge pull request #986 from pbjr23/fix-safe-range-memory

Fix memory usage bug in Python 2 by using correct version of range

6 years agosandbox uses xrange on Python 2 986/head
Prakhar Bhandari [Mon, 6 May 2019 16:00:53 +0000 (12:00 -0400)] 
sandbox uses xrange on Python 2

6 years agoMerge pull request #990 from tbnorth/vim_syntax_tweak
David Lord [Mon, 22 Jul 2019 14:55:11 +0000 (07:55 -0700)] 
Merge pull request #990 from tbnorth/vim_syntax_tweak

This is the correct thing to do, vim-wise, although whether

6 years agoMerge pull request #1018 from kbiggers/jinja/557
David Lord [Mon, 22 Jul 2019 14:42:04 +0000 (07:42 -0700)] 
Merge pull request #1018 from kbiggers/jinja/557

add default to map filter

6 years agoadd default to map filter 1018/head
Kevin [Fri, 31 May 2019 17:59:01 +0000 (13:59 -0400)] 
add default to map filter

6 years agoMerge pull request #1014 from markroth8/mroth/fix/748
David Lord [Sat, 20 Jul 2019 21:23:53 +0000 (14:23 -0700)] 
Merge pull request #1014 from markroth8/mroth/fix/748

Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748

6 years agoAllow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748. 1014/head
Mark Roth [Fri, 31 May 2019 22:52:45 +0000 (18:52 -0400)] 
Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748.

6 years agoMerge pull request #1022 from jdufresne/hl
David Lord [Sat, 20 Jul 2019 21:14:41 +0000 (14:14 -0700)] 
Merge pull request #1022 from jdufresne/hl

Correct syntax highlighting of jinja block in docs

6 years agoCorrect syntax highlighting of jinja block in docs 1022/head
Jon Dufresne [Fri, 21 Jun 2019 20:25:28 +0000 (13:25 -0700)] 
Correct syntax highlighting of jinja block in docs

6 years agoMerge branch '2.10.x'
David Lord [Sat, 20 Jul 2019 21:03:04 +0000 (14:03 -0700)] 
Merge branch '2.10.x'

6 years agoMerge pull request #1030 from rillian/PytestUnknownMarkWarning
David Lord [Sat, 20 Jul 2019 20:58:04 +0000 (13:58 -0700)] 
Merge pull request #1030 from rillian/PytestUnknownMarkWarning

Fix pytest unknown mark warnings

6 years agowarnings are errors during tests 1030/head
David Lord [Sat, 20 Jul 2019 20:56:23 +0000 (13:56 -0700)] 
warnings are errors during tests

6 years agoRegister custom test category markers.
Ralph Giles [Thu, 4 Jul 2019 20:24:51 +0000 (13:24 -0700)] 
Register custom test category markers.

Since around pytest 3.6 it's been possible to register custom
markers, and since version 4.5.0 pytest warns about any which
are not registered. Register a list of such markers, extracted
from those warnings, so they don't clutter the test output.

6 years agoignore coverage parse errors
David Lord [Sat, 20 Jul 2019 20:52:19 +0000 (13:52 -0700)] 
ignore coverage parse errors

Azure has Python 2.7.15 and Python 3.5.5, which can't parse async code.
Later patch versions can parse it fine, so this can be removed if
Azure updates.