1909 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Lord	626bdd08d4	Merge pull request #961 from JulienPalard/TemplateNotFound ... Better repr for TemplateNotFound.	2019-07-22 10:50:37 -07:00
David Lord	2e950f0f5f	Merge pull request #994 from bkiu/931-undeclared-variables ... exclude globals from find_undeclared_variables	2019-07-22 10:46:50 -07:00
Brendan	f7b110cbd0	exclude globals from find_undeclared_variables	2019-07-22 10:43:47 -07:00
David Lord	c5f1fd328b	Merge pull request #985 from bkiu/557-map-default ... Adding a default parameter to builtin map filter	2019-07-22 10:39:23 -07:00
David Lord	81783615ea	Merge branch 'master' into 557-map-default	2019-07-22 10:30:10 -07:00
Brendan	8b09b03aa0	Adding a default parameter to builtin map filter	2019-07-22 09:43:13 -07:00
David Lord	04cc41ea1e	Merge pull request #990 from tbnorth/vim_syntax_tweak ... This is the correct thing to do, vim-wise, although whether	2019-07-22 07:55:11 -07:00
David Lord	52c45df292	Merge pull request #1018 from kbiggers/jinja/557 ... add default to map filter	2019-07-22 07:42:04 -07:00
Kevin	2319cd5409	add default to map filter	2019-07-22 07:38:50 -07:00
David Lord	f76c3edf2b	Merge pull request #1014 from markroth8/mroth/fix/748 ... Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748	2019-07-20 14:23:53 -07:00
Mark Roth	1e71e31512	Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748.	2019-07-20 14:18:56 -07:00
David Lord	55cb0e73e6	Merge pull request #1022 from jdufresne/hl ... Correct syntax highlighting of jinja block in docs	2019-07-20 14:14:41 -07:00
Jon Dufresne	01af178323	Correct syntax highlighting of jinja block in docs	2019-07-20 14:10:02 -07:00
David Lord	13cc9f410c	Merge branch '2.10.x'	2019-07-20 14:03:04 -07:00
David Lord	e74640b5f3	Merge pull request #1030 from rillian/PytestUnknownMarkWarning ... Fix pytest unknown mark warnings	2019-07-20 13:58:04 -07:00
David Lord	6661be0899	warnings are errors during tests	2019-07-20 13:56:23 -07:00
Ralph Giles	c61b366c02	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.	2019-07-20 13:53:54 -07:00
David Lord	94cecd4892	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.	2019-07-20 13:52:19 -07:00
David Lord	d04d9998d3	switch tests to azure pipelines	2019-07-20 12:44:26 -07:00
David Lord	6257019870	Merge pull request #1025 from pallets/unpin-pytest ... Unpin Pytest on master branch	2019-07-20 12:22:17 -07:00
David Lord	ac6131d9b7	standardize license	2019-07-17 08:01:46 -07:00
Joshua Bronson	719c9f1f69	Merge pull request #1031 from minho42/Fix-typo ... Fix typo	2019-07-07 11:36:01 -04:00
Min ho Kim	911df8e792	Fix line length	2019-07-08 00:12:52 +10:00
Min ho Kim	55e4a13075	Apply suggestions	2019-07-07 23:07:29 +10:00
Min ho Kim	99f2a6c6e5	Fix typo	2019-07-07 09:38:28 +10:00
Kevin Brown	5b3d0c3d54	Merge pull request #975 from kevbroch/master ... add list filter to make example match output	2019-06-24 20:37:30 -04:00
Kevin Brown	88f2025e6e	Merge pull request #1002 from eplata31/bugfix-template-parse-if-with-dict-subproperty ... BUGFIX #930 - Template parse if with when referencing with dictionary…	2019-06-24 20:32:11 -04:00
Kevin Brown	321b499778	Merge pull request #1013 from mayuropensource/jinja-670-sort-multi-attr ... Add ability to specify multiple attributes in sort	2019-06-24 20:19:36 -04:00
Kevin Brown	1a33d44a09	Unpin pytest in tox.ini ... 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.	2019-06-24 20:07:01 -04:00
Joshua Bronson	6ffe6cc970	Merge pull request #1021 from jdufresne/the-the ... Fix typo "the the"	2019-06-21 19:47:51 -04:00
Jon Dufresne	aae91f42d1	Fix typo "the the"	2019-06-21 11:24:08 -07:00
David Lord	0f5f2010bb	Merge pull request #1019 from jbarreneche/backport-python3.7-collections-warning-fix ... Backport python3.7 collections warning fix	2019-06-18 08:22:01 -07:00
Juan Barreneche	4b1cae9c60	Add python 3.7 deprecation warning fix to changelog	2019-06-18 10:51:55 -03:00
Florian Bruhin	593ee1e481	Import abstract base classes from collections.abc ... In Python 3.7, importing ABCs directly from the `collections` module shows a warning (and in Python 3.8 it will stop working) - see c66f9f8d39 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 ```	2019-06-18 10:45:22 -03:00
mayur-srivastava	5dea3f7d9b	Refactor _prepare_attribute_parts() to use in both make_attrgetter() and make_multi_attrgetter()	2019-06-09 09:35:29 -04:00
Joshua Bronson	4ce2449a4c	Merge pull request #1009 from shamsimam/doc-python-methods ... adds documentation on use of python methods in expressions	2019-06-05 23:25:47 -04:00
Joshua Bronson	22e0bfc247	Merge pull request #1012 from yongbozhang/issue-423 ... Remind not to put block in if statements in doc	2019-06-05 23:17:55 -04:00
Joshua Bronson	7798e7964f	Merge pull request #1015 from jab/pr-1011 ... Document nested extends and super.super().	2019-06-05 23:12:50 -04:00
jab	a811d86acc	Fix "duplicate object description of jinja2" warning ... Follow suggestion to use :noindex: for the instance in api."	2019-06-05 23:04:36 -04:00
jab	72e55739ef	Improve nested extends (super.super) example.	2019-06-05 22:40:08 -04:00
Scott Crosby	b5c6c9c39d	Write a new documentation section on nesting extends.	2019-06-05 22:39:59 -04:00
yongbozhang	273d8b184d	issue-423 remind not to put block in if statements in doc	2019-06-02 16:27:55 -04:00
David Lord	7a6f97cee2	Merge pull request #1010 from dvamin/master ... docs: Python3-ize the examples	2019-05-31 17:01:21 -04:00
mayur-srivastava	8a39ecae15	Add ability to specify multiple attributes in sort, ... e.g. foo|sort(attribute='name,id'). This fixes #670	2019-05-31 16:50:15 -04:00
Deepak Amin	4965facc02	docs: Python3-ize the examples ... This commit updates the examples to conform to Python 3 instead of Python 2, as Python 3 is more acceptable these days.	2019-05-31 16:12:33 -04:00
Shams Imam	e632dc5f1b	adds documentation on use of python methods in expressions	2019-05-31 14:18:45 -05:00
David Lord	a486b37458	Merge pull request #1008 from gokcegrbl/GH-999 ... Added new method itervalues() to LRUCache and deprecated itervalue()	2019-05-31 13:15:03 -04:00
gokcegrbl	90595070ae	Added new method itervalues() to LRUCache and deprecated itervalue() ... (Fixes pallets/jinja#999)	2019-05-31 12:28:44 +00:00
David Lord	30685be089	Merge pull request #1004 from myii/patch-1 ... docs(filters): fix typo `columwrapper` => `columnwrapper`	2019-05-21 07:50:07 -07:00
Imran Iqbal	62ca10664f	docs(filters): fix typo columwrapper => columnwrapper	2019-05-20 13:19:08 +01:00