summaryrefslogtreecommitdiff
path: root/jinja2
Commit message (Collapse)AuthorAgeFilesLines
...
* | Added decorator support for finalize. This fixes #431Armin Ronacher2015-05-251-2/+24
|/
* Let the Environment override the ContextThiefMaster2015-04-062-2/+7
| | | | closes #404
* Let the Environment override the CodeGeneratorThiefMaster2015-04-062-2/+7
| | | | see #404
* Fix doctestsMarkus Unterwaditzer2015-03-224-29/+27
| | | | Fix #427
* Moving testsuite directory to root folderKartheek Lenkala2015-03-2221-3696/+0
|
* fixing errors due to removal of init.py from test suiteKartheek Lenkala2015-03-221-1/+1
|
* Pytest Initial CommitKartheek Lenkala2015-03-221-1/+0
|
* Pytest migration initial commitKartheek Lenkala2015-03-2219-990/+932
|
* Merge pull request #344 from walterl/masterMarkus Unterwaditzer2015-03-111-0/+2
|\ | | | | Added ".. versionadded:: 2.8" to `equalto` test
| * Added ".. versionadded:: 2.8" to test_equalto.__doc__Walter Leibbrandt2014-06-191-0/+2
| |
* | Merge pull request #375 from zart/fix-relative-search-on-windowsMarkus Unterwaditzer2015-03-111-1/+1
|\ \ | | | | | | Windows returns EINVAL on bogus filenames
| * | Windows returns EINVAL on bogus filenamesKonstantin Zemlyak2014-09-281-1/+1
| | | | | | | | | | | | Related pull of pyramid_jinja2: https://github.com/Pylons/pyramid_jinja2/pull/94
* | | Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanupMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | Change attr filter example to match description
| * | | Change attr filter example to match descriptionBrandon W Maister2015-02-051-1/+1
| |/ / | | | | | | | | | | | | foo["bar"] is an item lookup, so saying that items are not looked up with that as an example is confusing.
* | | Merge pull request #383 from rbtcollins/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | fix trivial typo (side -> size)
| * | | fix trivial typo (side -> size)rbtcollins2014-11-211-1/+1
| |/ /
* | | Merge pull request #388 from olegpesok/truncateDocFixMarkus Unterwaditzer2015-03-111-2/+2
|\ \ \ | | | | | | | | Fix incorrect truncate filter docs
| * | | Fix incorrect truncate filter docsOleg Pesok2014-12-101-2/+2
| |/ / | | | | | | | | | Examples contrary to behavior and description of killwords argument.
* | | Merge pull request #400 from scavpy/scavpy-patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | Replace lambda for 'dict' in with dict itself
| * | | Replace lambda for 'dict' in with dict itselfPeter Harris2015-01-231-1/+1
| |/ / | | | | | | | | | | | | | | | lambda **kw: kw is not equivalent to the dict constructor. It is much less useful. In particular it doesn't accept a sequence of pairs. Why not put dict itself into the DEFAULT_NAMESPACE? Principle of least surprise, etc.
* | | Merge pull request #397 from utzig/masterMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoFabio Utzig2015-01-181-1/+1
| |/ /
* | | decimal is a numberTim Bray2015-03-111-2/+2
| | |
* | | Typo Fixed.Abhishek Kumar Singh2015-03-071-1/+1
| | |
* | | fix copy-pasted typo in filter docstringsHans Meine2015-02-261-4/+4
| | |
* | | Disallow f(x, y=1, z) and similar nonsenseThiefMaster2015-02-062-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python rejects such function definitions because it doesn't make much sense to have arguments with no default values after arguments with default values. Jinja did allow them, but handled them improperly (associating the default value with the wrong argument). Due to how broken the current behavior is, it makes more sense to reject templates containing such defintions instead of trying to handle them properly. Both cases are going to break existing code containing such definitions, but besides the fact that possibly no such code exists it is better to fail with a clear error than to silently change the values of arguments. This fixes #364
* | | Merge pull request #406 from ThiefMaster/number-test-fixMarkus Unterwaditzer2015-02-063-4/+10
|\ \ \ | | | | | | | | Fix `long_integer is number` check in Python 2
| * | | Add float/complex testcases for `is number`ThiefMaster2015-02-061-2/+4
| | | |
| * | | Fix number test failing for long in Python 2ThiefMaster2015-02-063-3/+7
| |/ /
* | | Use PEP440-compatible dev versionThiefMAster2015-02-061-1/+1
|/ /
* | Increased cache size to 400.Armin Ronacher2014-08-281-3/+6
|/
* Merge pull request #230 from p1otr/masterArmin Ronacher2014-06-101-1/+1
|\ | | | | documentation typos
| * fix a bunch of typos in the documentationJakub Wilk2013-05-251-1/+1
| |
* | Implemented a block set tag.Armin Ronacher2014-06-074-31/+77
| |
* | Flake 8 fixesArmin Ronacher2014-06-061-9/+8
| |
* | Removed unused variableArmin Ronacher2014-06-061-1/+0
| |
* | Merge pull request #293 from carldunham/docfixArmin Ronacher2014-06-062-3/+2
|\ \ | | | | | | fixed some typos and clarifying
| * | fixed some typos and clarifyingCarl A Dunham2014-01-182-3/+2
| | |
* | | Merge pull request #282 from timhanus/masterArmin Ronacher2014-06-061-1/+6
|\ \ \ | | | | | | | | force a reload of the template if bytecode fails to unmarshall. issue #...
| * | | explicitly catch marshal errors rather than genertic exception #281Tim Hanus2013-11-221-1/+1
| | | |
| * | | force a reload of the template if bytecode fails to unmarshall. issue #281Tim Hanus2013-11-211-1/+6
| | | |
* | | | Merge branch '2.7-maintenance'Armin Ronacher2014-06-061-1/+9
|\ \ \ \
| * | | | Ready for 2.7.4Armin Ronacher2014-06-061-1/+1
| | | | |
| * | | | Bump version number to 2.7.32.7.3Armin Ronacher2014-06-061-1/+1
| | | | |
| * | | | Fix CVE-2014-0012Tomas Hoger2014-06-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add checks for the per-user temporary directory. If it already exists, make sure that it: - is owned by the current user - is directory - has expected permissions This commit also fixes: - nt -> n typo pointed out in the review of acb672b - replace 448 with stat.S_IRWXU when setting directory mode Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
* | | | | Applied changes from #296 for better checking.Armin Ronacher2014-06-061-4/+7
| | | | |
* | | | | Make sure filtering returns a list for template listing.Armin Ronacher2014-06-061-1/+1
| | | | |
* | | | | Fixed #320Armin Ronacher2014-06-062-1/+10
| | | | |
* | | | | Merge pull request #312 from fengsp/masterArmin Ronacher2014-06-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Removed duplication from ignored_tokens in lexer
| * | | | | Removed duplication from ignored_tokens in lexerfsp2014-03-181-2/+2
| | |_|/ / | |/| | |