]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
10 years agoFix typo: "the iterates" > "that iterates" 461/head
Steven Maude [Sat, 11 Jul 2015 22:01:08 +0000 (23:01 +0100)] 
Fix typo: "the iterates" > "that iterates"

In filters.py.

10 years agoFix syntax error
Markus Unterwaditzer [Mon, 1 Jun 2015 16:58:06 +0000 (18:58 +0200)] 
Fix syntax error

10 years agoUpdate FAQ about unsupported Python versions
Markus Unterwaditzer [Mon, 1 Jun 2015 15:15:43 +0000 (17:15 +0200)] 
Update FAQ about unsupported Python versions

Thanks to @ThomasWaldmann for the original patch. His fork is gone so I
can't apply the original commits.

10 years agoAdd Python classifiers for all supported versions
Markus Unterwaditzer [Mon, 1 Jun 2015 15:12:56 +0000 (17:12 +0200)] 
Add Python classifiers for all supported versions

Thanks to @ThomasWaldmann for the original patch. His fork is gone so I
can't apply the original commits.

10 years agoChangelog for #447
Markus Unterwaditzer [Mon, 1 Jun 2015 15:08:28 +0000 (17:08 +0200)] 
Changelog for #447

10 years agoMerge pull request #447 from bentimms/int-filter-base
Markus Unterwaditzer [Mon, 1 Jun 2015 15:08:01 +0000 (17:08 +0200)] 
Merge pull request #447 from bentimms/int-filter-base

Add 'base' parameter to 'int' filter

10 years agoMerge pull request #450 from jenisys/fixdoc.extension_example
Markus Unterwaditzer [Mon, 1 Jun 2015 15:07:42 +0000 (17:07 +0200)] 
Merge pull request #450 from jenisys/fixdoc.extension_example

FIX DOC-EXAMPLE: cache_extension.py

10 years agoSort filters, remove dupes
Markus Unterwaditzer [Mon, 1 Jun 2015 15:07:17 +0000 (17:07 +0200)] 
Sort filters, remove dupes

Fix #454

10 years agoMerge branch 'merwok-patch-1'
Markus Unterwaditzer [Mon, 1 Jun 2015 15:05:36 +0000 (17:05 +0200)] 
Merge branch 'merwok-patch-1'

Fix #455

10 years agoFix typo
Éric Araujo [Fri, 29 May 2015 20:57:10 +0000 (16:57 -0400)] 
Fix typo

10 years agoEscape slashes in query strings. This fixes #445
Armin Ronacher [Mon, 25 May 2015 11:40:47 +0000 (13:40 +0200)] 
Escape slashes in query strings.  This fixes #445

10 years agoMerge branch 'pr/451'
Armin Ronacher [Mon, 25 May 2015 10:25:02 +0000 (12:25 +0200)] 
Merge branch 'pr/451'

10 years agoAdded decorator support for finalize. This fixes #431
Armin Ronacher [Mon, 25 May 2015 10:24:09 +0000 (12:24 +0200)] 
Added decorator support for finalize.  This fixes #431

10 years agoAmend to #453
Markus Unterwaditzer [Sun, 17 May 2015 15:58:09 +0000 (17:58 +0200)] 
Amend to #453

10 years agoMerge pull request #453 from jeffwidman/patch-1
Markus Unterwaditzer [Sun, 17 May 2015 15:55:23 +0000 (17:55 +0200)] 
Merge pull request #453 from jeffwidman/patch-1

Fix typos and grammar in Readme

10 years agoFix typos and grammar in Readme 453/head
Jeff Widman [Sun, 17 May 2015 05:51:49 +0000 (22:51 -0700)] 
Fix typos and grammar in Readme

10 years agofix the fancy tracebacks on Python 3 451/head
Antti Haapala [Sun, 10 May 2015 07:04:15 +0000 (10:04 +0300)] 
fix the fancy tracebacks on Python 3

10 years agoFIX EXAMPLE: 450/head
jenisys [Sat, 9 May 2015 16:57:52 +0000 (18:57 +0200)] 
FIX EXAMPLE:
No longer working with current code base
since the TokenStream.next() method was removed.

10 years agoAdd 'base' parameter to 'int' filter 447/head
Ben Timms [Wed, 29 Apr 2015 15:45:46 +0000 (16:45 +0100)] 
Add 'base' parameter to 'int' filter

10 years agoMerge branch 'override-codegen-context'
Markus Unterwaditzer [Mon, 6 Apr 2015 12:28:25 +0000 (14:28 +0200)] 
Merge branch 'override-codegen-context'

10 years agoAdd changelog for #404
Markus Unterwaditzer [Mon, 6 Apr 2015 12:27:03 +0000 (14:27 +0200)] 
Add changelog for #404

10 years agoLet the Environment override the Context
ThiefMaster [Mon, 6 Apr 2015 12:08:46 +0000 (14:08 +0200)] 
Let the Environment override the Context

closes #404

10 years agoLet the Environment override the CodeGenerator
ThiefMaster [Mon, 6 Apr 2015 11:54:14 +0000 (13:54 +0200)] 
Let the Environment override the CodeGenerator

see #404

10 years agoMerge pull request #437 from alexwlchan/master
Markus Unterwaditzer [Mon, 6 Apr 2015 06:52:33 +0000 (08:52 +0200)] 
Merge pull request #437 from alexwlchan/master

Fix a few small typos in the docs

10 years agoFix a few small typos in the docs 437/head
Alex Chan [Sun, 5 Apr 2015 21:42:34 +0000 (22:42 +0100)] 
Fix a few small typos in the docs

10 years agoMerge branch '2.7-maintenance'
Markus Unterwaditzer [Thu, 2 Apr 2015 00:02:03 +0000 (02:02 +0200)] 
Merge branch '2.7-maintenance'

10 years agoFix syntax error
Markus Unterwaditzer [Thu, 2 Apr 2015 00:01:35 +0000 (02:01 +0200)] 
Fix syntax error

10 years agoMerge branch '2.7-maintenance'
Markus Unterwaditzer [Wed, 1 Apr 2015 23:54:08 +0000 (01:54 +0200)] 
Merge branch '2.7-maintenance'

10 years agoFix #433
Markus Unterwaditzer [Wed, 1 Apr 2015 23:52:52 +0000 (01:52 +0200)] 
Fix #433

10 years agoActually don't run doctests
Markus Unterwaditzer [Sun, 22 Mar 2015 13:36:12 +0000 (14:36 +0100)] 
Actually don't run doctests

10 years agoFix travis
Markus Unterwaditzer [Sun, 22 Mar 2015 13:32:16 +0000 (14:32 +0100)] 
Fix travis

10 years agoAdd build badges
Markus Unterwaditzer [Sun, 22 Mar 2015 13:31:39 +0000 (14:31 +0100)] 
Add build badges

10 years agochange py2 print statements to py3
Kartheek Lenkala [Sun, 22 Mar 2015 12:46:32 +0000 (18:16 +0530)] 
change py2 print statements to py3

10 years agoFix doctests
Markus Unterwaditzer [Sun, 22 Mar 2015 13:22:40 +0000 (14:22 +0100)] 
Fix doctests

Fix #427

10 years agoMerge branch 'lkarthee-pytest_migration'
Markus Unterwaditzer [Sun, 22 Mar 2015 12:48:17 +0000 (13:48 +0100)] 
Merge branch 'lkarthee-pytest_migration'

10 years agoExclude examples
Markus Unterwaditzer [Sun, 22 Mar 2015 12:46:22 +0000 (13:46 +0100)] 
Exclude examples

10 years agoUse tox in travis
Markus Unterwaditzer [Sun, 22 Mar 2015 12:46:08 +0000 (13:46 +0100)] 
Use tox in travis

10 years agoRename testsuite to tests and suggestions 426/head
Kartheek Lenkala [Sun, 22 Mar 2015 12:33:14 +0000 (18:03 +0530)] 
Rename testsuite to tests and suggestions

Remove  py.test from setup.py install_requires
Rename testsuite folder to tests.

10 years agoMoving testsuite directory to root folder
Kartheek Lenkala [Sun, 22 Mar 2015 11:31:50 +0000 (17:01 +0530)] 
Moving testsuite directory to root folder

10 years agofixing errors due to removal of init.py from test suite
Kartheek Lenkala [Sun, 22 Mar 2015 11:08:08 +0000 (16:38 +0530)] 
fixing errors due to removal of init.py from test suite

10 years agoAdding pytest references and dependencies in setup.py and Makefile
Kartheek Lenkala [Sun, 22 Mar 2015 10:50:41 +0000 (16:20 +0530)] 
Adding pytest references and dependencies in setup.py and Makefile

10 years agoPytest Initial Commit
Kartheek Lenkala [Sun, 22 Mar 2015 10:08:05 +0000 (15:38 +0530)] 
Pytest Initial Commit

10 years agoPytest migration initial commit
Kartheek Lenkala [Sun, 22 Mar 2015 09:58:54 +0000 (15:28 +0530)] 
Pytest migration initial commit

10 years agoMerge pull request #254 from yoloseem/master
Markus Unterwaditzer [Wed, 11 Mar 2015 20:33:16 +0000 (21:33 +0100)] 
Merge pull request #254 from yoloseem/master

Duplication of index and search links on main page of documentation.

10 years agoMerge branch '2.7-maintenance'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:32:16 +0000 (21:32 +0100)] 
Merge branch '2.7-maintenance'

10 years agoImport from correct location.
Markus Unterwaditzer [Wed, 11 Mar 2015 20:29:33 +0000 (21:29 +0100)] 
Import from correct location.

Fix #259

10 years agoMerge pull request #275 from yoloseem/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:28:21 +0000 (21:28 +0100)] 
Merge pull request #275 from yoloseem/patch-1

Fixed typos on docstrings of template filters.

10 years agoMerge pull request #343 from joernhees/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:28:01 +0000 (21:28 +0100)] 
Merge pull request #343 from joernhees/patch-1

Custom Filters example inserts escaped <br>s

10 years agoMerge pull request #344 from walterl/master
Markus Unterwaditzer [Wed, 11 Mar 2015 20:27:41 +0000 (21:27 +0100)] 
Merge pull request #344 from walterl/master

Added ".. versionadded:: 2.8" to `equalto` test

10 years agoMerge pull request #345 from hszcg/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:27:25 +0000 (21:27 +0100)] 
Merge pull request #345 from hszcg/patch-1

Fix missing " in docs/tricks.rst

10 years agoMerge branch 'adamchainz-master'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:26:50 +0000 (21:26 +0100)] 
Merge branch 'adamchainz-master'

10 years agoClarify sentence
Markus Unterwaditzer [Wed, 11 Mar 2015 20:26:24 +0000 (21:26 +0100)] 
Clarify sentence

10 years agoMerge pull request #375 from zart/fix-relative-search-on-windows
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:52 +0000 (21:19 +0100)] 
Merge pull request #375 from zart/fix-relative-search-on-windows

Windows returns EINVAL on bogus filenames

10 years agoMerge pull request #370 from BillyWM/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:34 +0000 (21:19 +0100)] 
Merge pull request #370 from BillyWM/patch-1

fix typo "makes sense to defined" -> define

10 years agoMerge pull request #362 from topher86/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:27 +0000 (21:19 +0100)] 
Merge pull request #362 from topher86/patch-1

Update djangojinja2.py

10 years agoMerge pull request #402 from quodlibetor/attr-filter-docstring-cleanup
Markus Unterwaditzer [Wed, 11 Mar 2015 20:19:10 +0000 (21:19 +0100)] 
Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanup

Change attr filter example to match description

10 years agoMerge pull request #383 from rbtcollins/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:18:33 +0000 (21:18 +0100)] 
Merge pull request #383 from rbtcollins/patch-1

fix trivial typo (side -> size)

10 years agoMerge pull request #381 from ubershmekel/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:18:01 +0000 (21:18 +0100)] 
Merge pull request #381 from ubershmekel/patch-1

A double quote is missing

10 years agoMerge pull request #388 from olegpesok/truncateDocFix
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:44 +0000 (21:17 +0100)] 
Merge pull request #388 from olegpesok/truncateDocFix

Fix incorrect truncate filter docs

10 years agoMerge pull request #403 from whit537/patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:28 +0000 (21:17 +0100)] 
Merge pull request #403 from whit537/patch-1

trim obsolete sentence re: i18n extension

10 years agoMerge pull request #400 from scavpy/scavpy-patch-1
Markus Unterwaditzer [Wed, 11 Mar 2015 20:17:01 +0000 (21:17 +0100)] 
Merge pull request #400 from scavpy/scavpy-patch-1

Replace lambda for 'dict' in with dict itself

10 years agoMerge pull request #395 from esonderegger/master
Markus Unterwaditzer [Wed, 11 Mar 2015 20:16:25 +0000 (21:16 +0100)] 
Merge pull request #395 from esonderegger/master

Updated template documentation examples

10 years agoMerge pull request #397 from utzig/master
Markus Unterwaditzer [Wed, 11 Mar 2015 20:16:10 +0000 (21:16 +0100)] 
Merge pull request #397 from utzig/master

Fix typo

10 years agoMerge pull request #398 from cerivera/master
Markus Unterwaditzer [Wed, 11 Mar 2015 20:15:58 +0000 (21:15 +0100)] 
Merge pull request #398 from cerivera/master

grammar fix

10 years agoMerge branch 'westurner-patch-1'
Markus Unterwaditzer [Wed, 11 Mar 2015 20:12:56 +0000 (21:12 +0100)] 
Merge branch 'westurner-patch-1'

10 years agoA few nitpicks
Markus Unterwaditzer [Wed, 11 Mar 2015 20:12:47 +0000 (21:12 +0100)] 
A few nitpicks

10 years agoWe don't want to give a specific recommendation.
Markus Unterwaditzer [Wed, 11 Mar 2015 19:58:42 +0000 (20:58 +0100)] 
We don't want to give a specific recommendation.

10 years agoNot only syntax is affected.
Markus Unterwaditzer [Wed, 11 Mar 2015 19:56:40 +0000 (20:56 +0100)] 
Not only syntax is affected.

10 years agodecimal is a number
Tim Bray [Thu, 10 Jul 2014 10:43:53 +0000 (11:43 +0100)] 
decimal is a number

10 years agoMerge pull request #418 from toanant/patch-1
Markus Unterwaditzer [Sat, 7 Mar 2015 12:26:10 +0000 (13:26 +0100)] 
Merge pull request #418 from toanant/patch-1

Typo Fixed.

10 years agoTypo Fixed. 418/head
Abhishek Kumar Singh [Sat, 7 Mar 2015 12:08:32 +0000 (17:38 +0530)] 
Typo Fixed.

10 years agoMerge pull request #413 from hmeine/master
Markus Unterwaditzer [Thu, 26 Feb 2015 17:23:47 +0000 (18:23 +0100)] 
Merge pull request #413 from hmeine/master

fix copy-pasted typo in filter docstrings

10 years agofix copy-pasted typo in filter docstrings 413/head
Hans Meine [Thu, 26 Feb 2015 14:36:51 +0000 (15:36 +0100)] 
fix copy-pasted typo in filter docstrings

10 years agoMerge pull request #239 from msabramo/tox_posargs
Markus Unterwaditzer [Thu, 26 Feb 2015 09:49:22 +0000 (10:49 +0100)] 
Merge pull request #239 from msabramo/tox_posargs

tox.ini: Use {posargs} so that test runner arguments can be passed to tox

10 years agoMerge pull request #405 from ThiefMaster/default-params-fix
Markus Unterwaditzer [Fri, 6 Feb 2015 17:18:41 +0000 (18:18 +0100)] 
Merge pull request #405 from ThiefMaster/default-params-fix

Disallow f(x, y=1, z) and similar nonsense

10 years agoDisallow f(x, y=1, z) and similar nonsense 405/head
ThiefMaster [Thu, 5 Feb 2015 23:34:36 +0000 (00:34 +0100)] 
Disallow f(x, y=1, z) and similar nonsense

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

10 years agoMerge pull request #406 from ThiefMaster/number-test-fix
Markus Unterwaditzer [Fri, 6 Feb 2015 17:12:29 +0000 (18:12 +0100)] 
Merge pull request #406 from ThiefMaster/number-test-fix

Fix `long_integer is number` check in Python 2

10 years agodeduplicate version info
Markus Unterwaditzer [Fri, 6 Feb 2015 17:11:55 +0000 (18:11 +0100)] 
deduplicate version info

10 years agoRemove automatic dev version generating
Markus Unterwaditzer [Fri, 6 Feb 2015 17:09:59 +0000 (18:09 +0100)] 
Remove automatic dev version generating

10 years agoMerge pull request #407 from ThiefMaster/pep-440-dev-version
Markus Unterwaditzer [Fri, 6 Feb 2015 17:06:35 +0000 (18:06 +0100)] 
Merge pull request #407 from ThiefMaster/pep-440-dev-version

Use PEP440-compatible dev version

10 years agoUse PEP440-compatible dev version 407/head
ThiefMAster [Fri, 6 Feb 2015 16:05:18 +0000 (17:05 +0100)] 
Use PEP440-compatible dev version

10 years agoAdd float/complex testcases for `is number` 406/head
ThiefMaster [Fri, 6 Feb 2015 00:12:09 +0000 (01:12 +0100)] 
Add float/complex testcases for `is number`

10 years agoFix number test failing for long in Python 2
ThiefMaster [Fri, 6 Feb 2015 00:09:13 +0000 (01:09 +0100)] 
Fix number test failing for long in Python 2

10 years agotrim obsolete sentence re: i18n extension 403/head
Chad Whitacre [Thu, 5 Feb 2015 19:53:19 +0000 (14:53 -0500)] 
trim obsolete sentence re: i18n extension

This sentence seems like a leftover from when i18n was the only extension available, eh?

10 years agoChange attr filter example to match description 402/head
Brandon W Maister [Thu, 5 Feb 2015 19:49:30 +0000 (14:49 -0500)] 
Change attr filter example to match description

foo["bar"] is an item lookup, so saying that items are not looked
up with that as an example is confusing.

10 years agoReplace lambda for 'dict' in with dict itself 400/head
Peter Harris [Fri, 23 Jan 2015 10:12:10 +0000 (10:12 +0000)] 
Replace lambda for 'dict' in with dict itself

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.

10 years agogrammar fix 398/head
Carlos Eduardo Rivera [Mon, 19 Jan 2015 02:22:34 +0000 (20:22 -0600)] 
grammar fix

10 years agoFix typo 397/head
Fabio Utzig [Sun, 18 Jan 2015 19:29:18 +0000 (17:29 -0200)] 
Fix typo

10 years agoUpdated template documentation examples 395/head
Evan Sonderegger [Thu, 8 Jan 2015 01:01:40 +0000 (20:01 -0500)] 
Updated template documentation examples

Fixed html tags in base template example. Since I was removing the
xmlns="http://www.w3.org/1999/xhtml" tag, it seemed like a good time to
update the examples to the html5 doctype.

10 years agoDOC: Update templates.rst: syntax, commas 389/head
Wes Turner [Thu, 11 Dec 2014 11:24:53 +0000 (05:24 -0600)] 
DOC: Update templates.rst: syntax, commas

10 years agoFix incorrect truncate filter docs 388/head
Oleg Pesok [Thu, 11 Dec 2014 01:15:40 +0000 (17:15 -0800)] 
Fix incorrect truncate filter docs

Examples contrary to behavior and description of killwords argument.

10 years agofix trivial typo (side -> size) 383/head
rbtcollins [Thu, 20 Nov 2014 21:35:32 +0000 (10:35 +1300)] 
fix trivial typo (side -> size)

10 years agoA double quote is missing 381/head
Yuval Greenfield [Thu, 6 Nov 2014 17:31:32 +0000 (09:31 -0800)] 
A double quote is missing

10 years agoWindows returns EINVAL on bogus filenames 375/head
Konstantin Zemlyak [Sun, 28 Sep 2014 15:08:28 +0000 (21:08 +0600)] 
Windows returns EINVAL on bogus filenames

Related pull of pyramid_jinja2: https://github.com/Pylons/pyramid_jinja2/pull/94

10 years agofix typo "possible to defined" -> define 370/head
William Wenge-Murphy [Sun, 21 Sep 2014 01:11:28 +0000 (18:11 -0700)] 
fix typo "possible to defined" -> define

10 years agoUpdate djangojinja2.py 362/head
topher86 [Thu, 28 Aug 2014 17:37:41 +0000 (13:37 -0400)] 
Update djangojinja2.py

Updating to reflect new default global cache size

10 years agoIncreased cache size to 400.
Armin Ronacher [Thu, 28 Aug 2014 07:10:22 +0000 (09:10 +0200)] 
Increased cache size to 400.

11 years agoSwitching docs tweaks 351/head
Adam Chainz [Sat, 12 Jul 2014 22:03:55 +0000 (23:03 +0100)] 
Switching docs tweaks

11 years agoFix missing " in docs/tricks.rst 345/head
Chenguang Zhang [Tue, 24 Jun 2014 08:04:35 +0000 (16:04 +0800)] 
Fix missing " in docs/tricks.rst

11 years agoAdded ".. versionadded:: 2.8" to test_equalto.__doc__ 344/head
Walter Leibbrandt [Wed, 18 Jun 2014 22:29:42 +0000 (00:29 +0200)] 
Added ".. versionadded:: 2.8" to test_equalto.__doc__