summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | use fspath instead of strDavid Lord2019-10-213-21/+40
| | |
| * | support pathlib in FileSystemLoader and ModuleLoaderAlex Chan2019-10-216-14/+114
|/ /
* | Merge pull request #1085 from pallets/docs-cyclerDavid Lord2019-10-202-25/+54
|\ \ | | | | | | clarify cycler.next() behavior
| * | clarify cycler.next() behaviorDavid Lord2019-10-202-25/+54
|/ /
* | Merge pull request #1084 from pallets/i18n-docsDavid Lord2019-10-193-115/+153
|\ \ | | | | | | clean up i18n documentation
| * | clean up i18n documentationDavid Lord2019-10-193-115/+153
|/ / | | | | | | | | | | | | | | explain enabling newstyle organize newstyle advantages mention escaping percent signs for formatting mention marking format parameters as safe fix newstyle ref
* | Merge pull request #1083 from pallets/docs-changesDavid Lord2019-10-183-53/+139
|\ \ | | | | | | Address various documentation requests
| * | document equivalent generator expressions for filtersDavid Lord2019-10-181-0/+35
| | | | | | | | | | | | closes #1068
| * | document how ContextReference relates to contextfunctionDavid Lord2019-10-181-0/+5
| | | | | | | | | | | | closes #762
| * | document formatting methods in format filterDavid Lord2019-10-181-4/+15
| | | | | | | | | | | | closes #566
| * | document lack of file extensionDavid Lord2019-10-181-0/+14
| | | | | | | | | | | | closes #547
| * | document behavior of block tag in if blockDavid Lord2019-10-181-0/+4
| | | | | | | | | | | | closes #423
| * | format expression docsDavid Lord2019-10-181-37/+37
| | |
| * | improve docs about string methods in templatesDavid Lord2019-10-181-12/+29
|/ / | | | | | | closes #273
* | Merge pull request #1082 from pallets/pkgutil-loaderDavid Lord2019-10-174-54/+152
|\ \ | | | | | | PackageLoader doesn't depend on setuptools
| * | PackageLoader doesn't depend on setuptoolsDavid Lord2019-10-174-54/+152
|/ /
* | Merge pull request #993 from aayushuppal/loop_fixDavid Lord2019-10-143-12/+62
|\ \ | | | | | | Fix for Loop properties revindex and revindex0 still wrong in Jinja2 2.10 #794
| * | fixing LoopContext, loops indexing and iterator length propertyaayushuppal2019-10-143-12/+62
|/ /
* | reformat changelogDavid Lord2019-10-141-5/+5
| |
* | Merge pull request #1079 from ThiefMaster/cond-expr-undefinedDavid Lord2019-10-135-3/+13
|\ \ | | | | | | Use separate undefined object for else-less conditional expressions
| * | Don't make cond_expr_undefined configurableAdrian Moennich2019-10-136-34/+16
| | |
| * | Use separate undefined object for CondExprAdrian Moennich2019-10-135-6/+34
|/ /
* | Merge pull request #1081 from pallets/open-if-existsDavid Lord2019-10-134-9/+23
|\ \ | | | | | | skip template with same name as directory
| * | skip template with same name as directoryDavid Lord2019-10-134-9/+23
|/ / | | | | | | | | | | When using multiple paths with FileSystemLoader, a template with the same name as a directory will not prevent loading a template in the directory.
* | Merge pull request #1080 from pallets/no-finalize-template-dataDavid Lord2019-10-124-40/+88
|\ \ | | | | | | don't finalize TemplateData nodes
| * | don't finalize TemplateData nodesno-finalize-template-dataDavid Lord2019-10-124-40/+88
|/ / | | | | | | | | Finalize only applies to the output of expressions (constant or not). Add tests for context, eval, and env finalize functions.
* | consistent use of token constantsDavid Lord2019-10-101-25/+31
| |
* | Merge pull request #1077 from pallets/pytest-cleanupDavid Lord2019-10-106-37/+17
|\ \ | | | | | | Pytest cleanup
| * | fix invalid double extends testDavid Lord2019-10-101-3/+3
| | |
| * | Replaced try...catch within tests with pytest.raisespytest-cleanupKevin Brown2019-10-106-35/+15
|/ / | | | | | | | | | | 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.
* | Merge pull request #824 from dagwieers/new-type-testsDavid Lord2019-10-093-39/+146
|\ \ | | | | | | Add more strict type tests
| * | Add more strict type testsDag Wieers2019-10-093-39/+146
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #1073 from brtomas0/masterDavid Lord2019-10-091-2/+2
|\ \ | | | | | | changed test_join functions to unique names
| * | changed test_join functions to unique namesBrandon Tomás2019-10-091-2/+2
|/ /
* | use slots for lexer lstrip markerDavid Lord2019-10-071-0/+2
| |
* | add changelog for #938David Lord2019-10-071-0/+3
| |
* | Merge pull request #938 from stevenorum/masterDavid Lord2019-10-072-0/+8
|\ \ | | | | | | Fixing compiler handling of parens around boolean comparisons.
| * | Fixing compiler handling of parens around boolean comparisons.Steve Norum2019-01-122-0/+8
| | |
* | | add changelog for #858David Lord2019-10-061-0/+2
| | |
* | | Merge pull request #858 from exponea/857-lexer-whitespace-performanceDavid Lord2019-10-061-58/+52
|\ \ \ | | | | | | | | Fix lexer being extremely slow on large amounts of whitespace. Fixes #857
| * | | add comments about lstrip codeDavid Lord2019-10-061-20/+37
| | | |
| * | | Merge branch 'master' into 857-lexer-whitespace-performanceDavid Lord2019-10-0668-2086/+1702
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1071 from btharper/pytest-raisesDavid Lord2019-10-052-15/+3
|\ \ \ \ | | | | | | | | | | Eliminate dead code by using pytests.raises instead of try/except/else
| * | | | Eliminate dead code by using pytests.raises instead of try/except/elsebtharper2019-10-062-15/+3
|/ / / /
* | | | Merge pull request #983 from kevin-brown/pr/798David Lord2019-10-045-33/+130
|\ \ \ \ | | | | | | | | | | Add support for a {% debug %} extension tag.
| * | | | document debug extensionDavid Lord2019-10-044-57/+88
| | | | |
| * | | | don't bypass autoescapeDavid Lord2019-10-042-29/+17
| | | | |
| * | | | Add support for a {% debug %} extension tag.Shaheed Haque2019-10-042-2/+80
|/ / / / | | | | | | | | | | | | This dumps the available variables, filters and tests.
* | | | Merge pull request #1047 from lfdebrux/ldeb-bug-chainable_undefined_and_markupDavid Lord2019-10-042-4/+12
|\ \ \ \ | | | | | | | | | | Fix bug with when using Markup on ChainableUndefined
| * | | | Fix bug with when using Markup on ChainableUndefinedLaurence de Bruxelles2019-10-042-4/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.