Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Added decorator support for finalize. This fixes #431 | Armin Ronacher | 2015-05-25 | 1 | -2/+24 | |
|/ | ||||||
* | Let the Environment override the Context | ThiefMaster | 2015-04-06 | 2 | -2/+7 | |
| | | | | closes #404 | |||||
* | Let the Environment override the CodeGenerator | ThiefMaster | 2015-04-06 | 2 | -2/+7 | |
| | | | | see #404 | |||||
* | Fix doctests | Markus Unterwaditzer | 2015-03-22 | 4 | -29/+27 | |
| | | | | Fix #427 | |||||
* | Moving testsuite directory to root folder | Kartheek Lenkala | 2015-03-22 | 21 | -3696/+0 | |
| | ||||||
* | fixing errors due to removal of init.py from test suite | Kartheek Lenkala | 2015-03-22 | 1 | -1/+1 | |
| | ||||||
* | Pytest Initial Commit | Kartheek Lenkala | 2015-03-22 | 1 | -1/+0 | |
| | ||||||
* | Pytest migration initial commit | Kartheek Lenkala | 2015-03-22 | 19 | -990/+932 | |
| | ||||||
* | Merge pull request #344 from walterl/master | Markus Unterwaditzer | 2015-03-11 | 1 | -0/+2 | |
|\ | | | | | Added ".. versionadded:: 2.8" to `equalto` test | |||||
| * | Added ".. versionadded:: 2.8" to test_equalto.__doc__ | Walter Leibbrandt | 2014-06-19 | 1 | -0/+2 | |
| | | ||||||
* | | Merge pull request #375 from zart/fix-relative-search-on-windows | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ | | | | | | | Windows returns EINVAL on bogus filenames | |||||
| * | | Windows returns EINVAL on bogus filenames | Konstantin Zemlyak | 2014-09-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | Related pull of pyramid_jinja2: https://github.com/Pylons/pyramid_jinja2/pull/94 | |||||
* | | | Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanup | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Change attr filter example to match description | |||||
| * | | | Change attr filter example to match description | Brandon W Maister | 2015-02-05 | 1 | -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-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix trivial typo (side -> size) | |||||
| * | | | fix trivial typo (side -> size) | rbtcollins | 2014-11-21 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge pull request #388 from olegpesok/truncateDocFix | Markus Unterwaditzer | 2015-03-11 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Fix incorrect truncate filter docs | |||||
| * | | | Fix incorrect truncate filter docs | Oleg Pesok | 2014-12-10 | 1 | -2/+2 | |
| |/ / | | | | | | | | | | Examples contrary to behavior and description of killwords argument. | |||||
* | | | Merge pull request #400 from scavpy/scavpy-patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Replace lambda for 'dict' in with dict itself | |||||
| * | | | Replace lambda for 'dict' in with dict itself | Peter Harris | 2015-01-23 | 1 | -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/master | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix typo | |||||
| * | | | Fix typo | Fabio Utzig | 2015-01-18 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | decimal is a number | Tim Bray | 2015-03-11 | 1 | -2/+2 | |
| | | | ||||||
* | | | Typo Fixed. | Abhishek Kumar Singh | 2015-03-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | fix copy-pasted typo in filter docstrings | Hans Meine | 2015-02-26 | 1 | -4/+4 | |
| | | | ||||||
* | | | Disallow f(x, y=1, z) and similar nonsense | ThiefMaster | 2015-02-06 | 2 | -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-fix | Markus Unterwaditzer | 2015-02-06 | 3 | -4/+10 | |
|\ \ \ | | | | | | | | | Fix `long_integer is number` check in Python 2 | |||||
| * | | | Add float/complex testcases for `is number` | ThiefMaster | 2015-02-06 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | Fix number test failing for long in Python 2 | ThiefMaster | 2015-02-06 | 3 | -3/+7 | |
| |/ / | ||||||
* | | | Use PEP440-compatible dev version | ThiefMAster | 2015-02-06 | 1 | -1/+1 | |
|/ / | ||||||
* | | Increased cache size to 400. | Armin Ronacher | 2014-08-28 | 1 | -3/+6 | |
|/ | ||||||
* | Merge pull request #230 from p1otr/master | Armin Ronacher | 2014-06-10 | 1 | -1/+1 | |
|\ | | | | | documentation typos | |||||
| * | fix a bunch of typos in the documentation | Jakub Wilk | 2013-05-25 | 1 | -1/+1 | |
| | | ||||||
* | | Implemented a block set tag. | Armin Ronacher | 2014-06-07 | 4 | -31/+77 | |
| | | ||||||
* | | Flake 8 fixes | Armin Ronacher | 2014-06-06 | 1 | -9/+8 | |
| | | ||||||
* | | Removed unused variable | Armin Ronacher | 2014-06-06 | 1 | -1/+0 | |
| | | ||||||
* | | Merge pull request #293 from carldunham/docfix | Armin Ronacher | 2014-06-06 | 2 | -3/+2 | |
|\ \ | | | | | | | fixed some typos and clarifying | |||||
| * | | fixed some typos and clarifying | Carl A Dunham | 2014-01-18 | 2 | -3/+2 | |
| | | | ||||||
* | | | Merge pull request #282 from timhanus/master | Armin Ronacher | 2014-06-06 | 1 | -1/+6 | |
|\ \ \ | | | | | | | | | force a reload of the template if bytecode fails to unmarshall. issue #... | |||||
| * | | | explicitly catch marshal errors rather than genertic exception #281 | Tim Hanus | 2013-11-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | force a reload of the template if bytecode fails to unmarshall. issue #281 | Tim Hanus | 2013-11-21 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | Merge branch '2.7-maintenance' | Armin Ronacher | 2014-06-06 | 1 | -1/+9 | |
|\ \ \ \ | ||||||
| * | | | | Ready for 2.7.4 | Armin Ronacher | 2014-06-06 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Bump version number to 2.7.32.7.3 | Armin Ronacher | 2014-06-06 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix CVE-2014-0012 | Tomas Hoger | 2014-06-06 | 1 | -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 Ronacher | 2014-06-06 | 1 | -4/+7 | |
| | | | | | ||||||
* | | | | | Make sure filtering returns a list for template listing. | Armin Ronacher | 2014-06-06 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fixed #320 | Armin Ronacher | 2014-06-06 | 2 | -1/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #312 from fengsp/master | Armin Ronacher | 2014-06-06 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Removed duplication from ignored_tokens in lexer | |||||
| * | | | | | Removed duplication from ignored_tokens in lexer | fsp | 2014-03-18 | 1 | -2/+2 | |
| | |_|/ / | |/| | | |