]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
5 years agocreating a NativeTemplate creates a NativeEnvironment 1095/head
David Lord [Mon, 28 Oct 2019 16:00:01 +0000 (09:00 -0700)] 
creating a NativeTemplate creates a NativeEnvironment

5 years agoMerge pull request #1090 from pallets/lrucache-copy
David Lord [Thu, 24 Oct 2019 15:00:39 +0000 (08:00 -0700)] 
Merge pull request #1090 from pallets/lrucache-copy

LRUCache.copy's queue methods point to the correct queue

5 years agodon't create a third queue 1090/head
David Lord [Thu, 24 Oct 2019 14:54:38 +0000 (07:54 -0700)] 
don't create a third queue

5 years agoLRUCache.copy initializes queue methods
Ryan Siemens [Mon, 23 Apr 2018 07:26:22 +0000 (00:26 -0700)] 
LRUCache.copy initializes queue methods

5 years agouse "Jinja" instead of "Jinja2"
David Lord [Wed, 23 Oct 2019 20:35:49 +0000 (13:35 -0700)] 
use "Jinja" instead of "Jinja2"

5 years agoMerge pull request #1087 from pallets/jinja-name
David Lord [Wed, 23 Oct 2019 19:40:55 +0000 (12:40 -0700)] 
Merge pull request #1087 from pallets/jinja-name

use "Jinja" instead of "Jinja2"

5 years agouse "Jinja" instead of "Jinja2" 1087/head
David Lord [Wed, 23 Oct 2019 19:29:46 +0000 (12:29 -0700)] 
use "Jinja" instead of "Jinja2"

5 years agoMerge pull request #1086 from pallets/native-string-literal
David Lord [Tue, 22 Oct 2019 20:33:24 +0000 (13:33 -0700)] 
Merge pull request #1086 from pallets/native-string-literal

preserve quotes between nodes in native env

5 years agopreserve quotes between nodes in native env 1086/head
David Lord [Tue, 22 Oct 2019 19:52:59 +0000 (12:52 -0700)] 
preserve quotes between nodes in native env

5 years agoMerge pull request #1064 from alexwlchan/support-pathlib
David Lord [Mon, 21 Oct 2019 14:41:01 +0000 (07:41 -0700)] 
Merge pull request #1064 from alexwlchan/support-pathlib

Support paths created with pathlib in FileSystemLoader and ModuleLoader

5 years agouse fspath instead of str 1064/head
David Lord [Mon, 21 Oct 2019 14:00:25 +0000 (07:00 -0700)] 
use fspath instead of str

5 years agosupport pathlib in FileSystemLoader and ModuleLoader
Alex Chan [Sun, 22 Sep 2019 07:56:46 +0000 (08:56 +0100)] 
support pathlib in FileSystemLoader and ModuleLoader

5 years agoMerge pull request #1085 from pallets/docs-cycler
David Lord [Sun, 20 Oct 2019 23:50:28 +0000 (16:50 -0700)] 
Merge pull request #1085 from pallets/docs-cycler

clarify cycler.next() behavior

5 years agoclarify cycler.next() behavior 1085/head
David Lord [Sun, 20 Oct 2019 23:42:14 +0000 (16:42 -0700)] 
clarify cycler.next() behavior

5 years agoMerge pull request #1084 from pallets/i18n-docs
David Lord [Sat, 19 Oct 2019 15:08:56 +0000 (08:08 -0700)] 
Merge pull request #1084 from pallets/i18n-docs

clean up i18n documentation

5 years agoclean up i18n documentation 1084/head
David Lord [Sat, 19 Oct 2019 14:30:39 +0000 (07:30 -0700)] 
clean up i18n documentation

explain enabling newstyle
organize newstyle advantages
mention escaping percent signs for formatting
mention marking format parameters as safe
fix newstyle ref

5 years agoMerge pull request #1083 from pallets/docs-changes
David Lord [Fri, 18 Oct 2019 19:25:27 +0000 (12:25 -0700)] 
Merge pull request #1083 from pallets/docs-changes

Address various documentation requests

5 years agodocument equivalent generator expressions for filters 1083/head
David Lord [Fri, 18 Oct 2019 19:19:03 +0000 (12:19 -0700)] 
document equivalent generator expressions for filters
closes #1068

5 years agodocument how ContextReference relates to contextfunction
David Lord [Fri, 18 Oct 2019 19:03:02 +0000 (12:03 -0700)] 
document how ContextReference relates to contextfunction
closes #762

5 years agodocument formatting methods in format filter
David Lord [Fri, 18 Oct 2019 18:53:33 +0000 (11:53 -0700)] 
document formatting methods in format filter
closes #566

5 years agodocument lack of file extension
David Lord [Fri, 18 Oct 2019 18:37:37 +0000 (11:37 -0700)] 
document lack of file extension
closes #547

5 years agodocument behavior of block tag in if block
David Lord [Fri, 18 Oct 2019 18:31:00 +0000 (11:31 -0700)] 
document behavior of block tag in if block
closes #423

5 years agoformat expression docs
David Lord [Fri, 18 Oct 2019 18:23:59 +0000 (11:23 -0700)] 
format expression docs

5 years agoimprove docs about string methods in templates
David Lord [Fri, 18 Oct 2019 18:20:25 +0000 (11:20 -0700)] 
improve docs about string methods in templates
closes #273

5 years agoMerge pull request #1082 from pallets/pkgutil-loader
David Lord [Thu, 17 Oct 2019 18:17:24 +0000 (11:17 -0700)] 
Merge pull request #1082 from pallets/pkgutil-loader

PackageLoader doesn't depend on setuptools

5 years agoPackageLoader doesn't depend on setuptools 1082/head
David Lord [Wed, 16 Oct 2019 20:23:36 +0000 (13:23 -0700)] 
PackageLoader doesn't depend on setuptools

5 years agoMerge pull request #993 from aayushuppal/loop_fix
David Lord [Mon, 14 Oct 2019 16:16:59 +0000 (09:16 -0700)] 
Merge pull request #993 from aayushuppal/loop_fix

Fix for Loop properties revindex and revindex0 still wrong in Jinja2 2.10 #794

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