delta/jinja2.git - github.com: mitsuhiko/jinja2.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \| \|	Import abstract base classes from collections.abc	Florian Bruhin	2019-06-18	6	-26/+19
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Python 3.7, importing ABCs directly from the `collections` module shows a warning (and in Python 3.8 it will stop working) - see https://github.com/python/cpython/commit/c66f9f8d3909f588c251957d499599a1680e2320 This fixes various DeprecationWarnings such as those: ``` .../jinja2/utils.py:485: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import MutableMapping .../jinja2/runtime.py:318: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working from collections import Mapping ```
\| * \| \| \| \| \| \| \| \|	Merge pull request #1009 from shamsimam/doc-python-methods	Joshua Bronson	2019-06-05	1	-1/+23
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adds documentation on use of python methods in expressions
\| \| * \| \| \| \| \| \| \| \|	adds documentation on use of python methods in expressions	Shams Imam	2019-05-31	1	-1/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #1012 from yongbozhang/issue-423	Joshua Bronson	2019-06-05	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remind not to put block in if statements in doc
\| \| * \| \| \| \| \| \| \| \| \|	issue-423 remind not to put block in if statements in doc	yongbozhang	2019-06-02	1	-1/+3
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #1010 from dvamin/master	David Lord	2019-05-31	2	-4/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	docs: Python3-ize the examples
\| \| * \| \| \| \| \| \| \| \|	docs: Python3-ize the examples	Deepak Amin	2019-05-31	2	-4/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the examples to conform to Python 3 instead of Python 2, as Python 3 is more acceptable these days.
\| * \| \| \| \| \| \| \| \|	Merge pull request #988 from tbnorth/triv_docs_link	Kevin Brown	2019-05-11	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #242, deletes link to Jinja 1 docs.
\| \| * \| \| \| \| \| \| \| \|	fixes #242, deletes link to Jinja 1 docs.	Terry N. Brown	2019-05-06	1	-2/+1
\| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Add new maintenance branch format to Travis (#987)	Kevin Brown	2019-05-07	1	-5/+6
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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.
* \| \| \| \| \| \| \| \|	Merge pull request #1025 from pallets/unpin-pytest	David Lord	2019-07-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unpin Pytest on master branch
\| * \| \| \| \| \| \| \| \|	Unpin pytest in tox.iniunpin-pytest	Kevin Brown	2019-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was "temporarily" pinned many months back, given that this is not pinned on the stable branch and tests appear to be passing, we should be able to remove it here.
* \| \| \| \| \| \| \| \| \|	standardize license	David Lord	2019-07-17	3	-32/+29
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1031 from minho42/Fix-typo	Joshua Bronson	2019-07-07	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo
\| * \| \| \| \| \| \| \| \| \|	Fix line length	Min ho Kim	2019-07-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Apply suggestions	Min ho Kim	2019-07-07	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix typo	Min ho Kim	2019-07-07	2	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #975 from kevbroch/master	Kevin Brown	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add list filter to make example match output
\| * \| \| \| \| \| \| \| \| \|	add list filter to make example match output	Kevin Broch	2019-04-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1002 from ↵	Kevin Brown	2019-06-24	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eplata31/bugfix-template-parse-if-with-dict-subproperty BUGFIX #930 - Template parse if with when referencing with dictionary…
\| * \| \| \| \| \| \| \| \| \| \|	BUGFIX #930 - Template parse if with when referencing with dictionary ↵	eplata31	2019-05-13	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	subproperty
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1013 from mayuropensource/jinja-670-sort-multi-attr	Kevin Brown	2019-06-24	2	-7/+76
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add ability to specify multiple attributes in sort
\| * \| \| \| \| \| \| \| \| \| \|	Refactor _prepare_attribute_parts() to use in both make_attrgetter() and ↵	mayur-srivastava	2019-06-09	1	-14/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make_multi_attrgetter()
\| * \| \| \| \| \| \| \| \| \| \|	Add ability to specify multiple attributes in sort,	mayur-srivastava	2019-05-31	2	-1/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	e.g. foo\|sort(attribute='name,id'). This fixes #670
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1021 from jdufresne/the-the	Joshua Bronson	2019-06-21	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo "the the"
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo "the the"	Jon Dufresne	2019-06-21	2	-2/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1015 from jab/pr-1011	Joshua Bronson	2019-06-05	2	-1/+37
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document nested extends and super.super().
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix "duplicate object description of jinja2" warning	jab	2019-06-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow suggestion to use :noindex: for the instance in api."
\| * \| \| \| \| \| \| \| \| \| \| \|	Improve nested extends (super.super) example.	jab	2019-06-05	1	-19/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Write a new documentation section on nesting extends.	Scott Crosby	2019-06-05	1	-0/+30
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1008 from gokcegrbl/GH-999	David Lord	2019-05-31	2	-0/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Added new method itervalues() to LRUCache and deprecated itervalue()
\| * \| \| \| \| \| \| \| \| \| \|	Added new method itervalues() to LRUCache and deprecated itervalue()	gokcegrbl	2019-05-31	2	-0/+30
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixes pallets/jinja#999)
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1004 from myii/patch-1	David Lord	2019-05-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs(filters): fix typo `columwrapper` => `columnwrapper`
\| * \| \| \| \| \| \| \| \| \| \|	docs(filters): fix typo `columwrapper` => `columnwrapper`	Imran Iqbal	2019-05-20	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1003 from flexferrum/master	David Lord	2019-05-17	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Remove duplicated testcase
\| * \| \| \| \| \| \| \| \| \|	Remove duplicated testcase	Flex Ferrum	2019-05-16	1	-2/+0
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Add ChainableUndefined allowing getattr & getitem (#997)	Étienne Pelletier	2019-05-08	7	-9/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add ChainableUndefined allowing getattr & getitem Allows using default values with chains of items or attributes that may contain undefined values without raising a jinja2.exceptions.UndefinedError. >>> import jinja2 >>> env = jinja2.Environment(undefined=jinja2.ChainableUndefined) >>> env.from_string("{{ foo.bar['baz'] \| default('val') }}").render() 'val' * Remove class decorator from ChainableUndefined
* \| \| \| \| \| \| \| \| \|	Merge pull request #989 from LindsayYoung/patch-1	David Lord	2019-05-06	1	-0/+76
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CODE_OF_CONDUCT.md
\| * \| \| \| \| \| \| \| \| \|	Create CODE_OF_CONDUCT.md	Lindsay Young	2019-05-06	1	-0/+76
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ticket is referenced in [#Issue 1](https://github.com/pallets/meta/issues/1) in the Meta repo. I spoke with @davidism and the decision was to use Contributor Covenant. It has easy GitHub integration and quality content.
* \| \| \| \| \| \| \| \| \|	Fix use of 'is' operator for comparison	Raul Tambre	2019-05-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'is' operator is not meant to be used for comparisons. It currently working is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning for this.
\| \| \| \| * \| \| \| \| \|	Adding a default parameter to builtin map filter	Brendan	2019-07-22	3	-2/+32
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/2.10.x'	David Lord	2019-05-06	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| / / / / / / / \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #982 from kevin-brown/sphinx-upgrade	David Lord	2019-05-06	1	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|	Fix tox docs-html builds
\| \| * \| \| \| \| \|	Fix tox docs-html builds	Kevin Brown	2019-05-06	1	-4/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| \| * \| \|	Fix lexer being extremely slow on large amounts of whitespace. Fixes #857	Peter Dolak	2019-05-06	1	-43/+30
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch '2.10.x'	David Lord	2019-04-06	3	-3/+43
\|\ \ \ \ \ \ \| \|/ / / / / \| \| / / / / \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	release 2.10.12.10.1	David Lord	2019-04-06	3	-2/+12
\| \| \| \| \|
\| * \| \| \|	sandbox str.format_map	Armin Ronacher	2019-04-06	2	-3/+33
\| \| \| \| \|
* \| \| \| \|	Update CHANGES.rst	Armin Ronacher	2019-02-18	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Await in async version of the map filter (#913)	seaders	2019-02-18	3	-2/+11
\| \| \| \| \|