summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Ignore empty lines in indent filterFrancisco Jiménez Cabrera2017-07-072-8/+24
|/ / / / /
* | | | | Merge pull request #617 from jackwilsdon/dont-skip-commaDavid Lord2017-07-073-2/+8
|\ \ \ \ \ | | | | | | | | | | | | Don't skip an erroneous comma when parsing "from"
| * | | | | add test and changelogDavid Lord2017-07-072-1/+8
| | | | | |
| * | | | | Don't skip an erroneous comma when parsing fromJack Wilsdon2017-07-071-1/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we skip an extra comma when "with context" is not provided to the "from" statement. This allows invalid code such as this: {% from "functions.html" import my_function,, %} The primary issue with this is that it is not consistent when providing "with context". The following code throws an error, contrary to the previous example: {% from "functions.html" import my_function,, with context %} It seems that the comma skipping was originally found in 0611e49 and was accidentally put inside the "with context" check in ea847c5. It was then updated to use "skip_if" in fdf9530. There doesn't seem to be any reason for this check existing, as double commas should never be allowed and serve no purpose in the statement.
* | | | | Merge pull request #618 from jackwilsdon/stricter-from-parsingDavid Lord2017-07-073-3/+23
|\ \ \ \ \ | | | | | | | | | | | | Add stricter checking to "from ... import ..."
| * | | | | add tests and changelogDavid Lord2017-07-072-2/+22
| | | | | |
| * | | | | Add stricter checking to "from ... import ..."Jack Wilsdon2017-07-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently token parsing on "from ... import ..." is rather "loose" — it sees the following "invalid" code as perfectly valid: {% from "functions" import my_function, %} {% from "functions" import, %} {% from "functions" import %} This is caused by the parser ignoring non-name values where there should be names, either as the first value or after commas. This commit ensures only name values are allowed as the first value and any values after commas in the import section.
* | | | | Merge pull request #740 from davidism/optimize-testsDavid Lord2017-07-071-15/+47
|\ \ \ \ \ | | | | | | | | | | | | Inline template tests during optimization
| * | | | | Inline template tests during optimizationSebastian Noack2017-07-071-15/+47
|/ / / / /
| | | * | Add support for the Environment to optionally return native types.James Tanner2017-07-065-0/+380
| |_|/ / |/| | | | | | | | | | | | | | | | | | | This works by having an alternate CodeGenerator that avoids doing to_string after the yield statement and a new version of concat that handles the returned generator with a bit more "intelligence".
* | | | Merge pull request #665 from pallets/operator-testsDavid Lord2017-07-064-48/+64
|\ \ \ \ | | | | | | | | | | Allow using comparison operator symbols as tests
| * | | | allow using comparison operator symbols as testsDavid Lord2017-07-064-48/+64
|/ / / / | | | | | | | | | | | | | | | | | | | | add tests and aliases for all comparison operators adjust docs to prefer short names for compare tests closes #664
* | | | Merge pull request #738 from davidism/test-configDavid Lord2017-07-069-40/+86
|\ \ \ \ | | | | | | | | | | Standard test config
| * | | | standard test configurationDavid Lord2017-07-065-13/+72
| | | | | | | | | | | | | | | | | | | | add branch coverage and codecov
| * | | | fix docs warningsDavid Lord2017-07-063-9/+14
| | | | |
| * | | | remove test copied from markupsafeDavid Lord2017-07-061-18/+0
|/ / / /
* | | | Merge pull request #737 from davidism/minmax-filtersDavid Lord2017-07-063-19/+74
|\ \ \ \ | | | | | | | | | | min and max filters
| * | | | parametrize testsDavid Lord2017-07-063-62/+42
| | | | | | | | | | | | | | | | | | | | | | | | | argument order consistent with existing filters add changelog
| * | | | Added min and max filtersSebastian Noack2017-07-062-1/+76
|/ / / /
* | | | Merge pull request #735 from davidism/unique-filterDavid Lord2017-07-053-28/+94
|\ \ \ \ | | | | | | | | | | Unique filter
| * | | | make attrgetter take generic postprocess functionDavid Lord2017-07-053-24/+39
| | | | | | | | | | | | | | | | | | | | add changelog
| * | | | Merge branch 'master' into unique-filterDavid Lord2017-07-0567-1364/+4809
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #734 from davidism/dont-inline-randomDavid Lord2017-07-053-10/+25
|\ \ \ \ \ | | | | | | | | | | | | Prevent random filter from being folded
| * | | | | fix random test for py2David Lord2017-07-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | add changelog
| * | | | | test compares random filter to random call with same seedDavid Lord2017-07-051-11/+15
| | | | | |
| * | | | | Merge branch 'master' into dont-inline-randomDavid Lord2017-07-0566-1309/+4779
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #731 from pallets/feature/kill-stringdefsDavid Lord2017-07-046-97/+140
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use str.isidentifier to match idents on python 3
| * | | | | | go back to generating regex, simplifiedfeature/kill-stringdefsDavid Lord2017-07-044-12/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new version uses ~2KB vs 200KB memory, is ~100x faster to load move script to generate pattern to scripts directory add more tests
| * | | | | | remove unnecessary \b from name regexDavid Lord2017-07-032-11/+9
| | | | | | |
| * | | | | | switch back to unicode escapesDavid Lord2017-07-021-4/+4
| | | | | | |
| * | | | | | fix unicode for py2David Lord2017-07-021-13/+13
| | | | | | |
| * | | | | | only test master and maintenance branchesDavid Lord2017-07-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | avoids duplicate work for internal prs
| * | | | | | test for new identifier lexerDavid Lord2017-07-022-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | currently fails on special case unicode
| * | | | | | Added missing identifiers to the name reArmin Ronacher2017-07-021-1/+7
| | | | | | |
| * | | | | | Inversed invalid logicArmin Ronacher2017-07-011-3/+3
| | | | | | |
| * | | | | | Use str.isidentifier to match idents on python 3Armin Ronacher2017-07-012-91/+12
| | | | | | |
* | | | | | | Add support for `{% trans trimmed ... %}`Adrian Moennich2017-07-037-1/+123
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same behavior as in Django: All linebreaks and the whitespace surrounding linebreaks are replaced with a single space. closes #504
* | | | | | Merge pull request #684 from ThiefMaster/set-namespacesAdrian2017-06-2412-11/+168
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add namespace objects that support attribute assignment
| * | | | | | Don't allow setting real attributes on ns objectsAdrian Moennich2017-06-242-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/pallets/jinja/pull/684#issuecomment-291958060
| * | | | | | Add docs for namespace functionalityAdrian Moennich2017-06-242-0/+43
| | | | | | |
| * | | | | | Add unit tests for namespace functionalityAdrian Moennich2017-06-242-3/+57
| | | | | | |
| * | | | | | Add support for namespace attribute assignmentAdrian Moennich2017-06-248-8/+57
|/ / / / / /
* | | | | | Merge pull request #676 from ThiefMaster/loop-lookaroundsAdrian2017-06-248-13/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add previtem/nextitem/changed() to loop context
| * | | | | | Add changed() to loop contextAdrian Moennich2017-06-245-0/+38
| | | | | | |
| * | | | | | Add previtem/nextitem to loop contextAdrian Moennich2017-06-247-13/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | related: #641
| * | | | | | Add @ThiefMaster to list of contributorsAdrian Moennich2017-06-241-0/+1
|/ / / / / /
* | | | | | Merge pull request #721 from jpassaro/issue_720David Lord2017-06-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | disable recursive comments in vim syntax file
| * | | | | | disable recursive comments in vim syntax fileJohn Passaro2017-06-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes #720
* | | | | | Merge pull request #703 from jdufresne/httpsDavid Lord2017-04-099-17/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | In documentation, prefer https over http when available
| * | | | | | In documentation, prefer https over http when availableJon Dufresne2017-04-099-17/+17
| | | | | | |
View Lorry Controller Status