]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
9 years agoChange environment cache key construction 585/head
pgjones [Sat, 21 May 2016 15:17:21 +0000 (16:17 +0100)] 
Change environment cache key construction

Changing from a tuple of the loader ID and template name to a weakref
to the loader and the template name should avoid situations whereby
the loader has changed, yet the cached templates are returned. This
would occur if the id of the new loader matches the old. A weakref is
preferred over a direct reference so that the loader can be garbaged
collected.

9 years agoMerge branch 'pgjones-master'
Markus Unterwaditzer [Thu, 19 May 2016 18:59:56 +0000 (20:59 +0200)] 
Merge branch 'pgjones-master'

9 years agoChangelog for #583
Markus Unterwaditzer [Thu, 19 May 2016 18:59:14 +0000 (20:59 +0200)] 
Changelog for #583

9 years agoChange cache key definitiion in environment 583/head
pgjones [Sun, 8 May 2016 15:10:35 +0000 (16:10 +0100)] 
Change cache key definitiion in environment

In 6671b973e6de5abc46829a27fd3bbb989d68ca3a the load_template method
was altered to use a cache key other than the template name. The key
chosen was the abs path as returned from the loader get_source
method. Unless there is no path in which case the name is
used. Unfortunately this introduced a performance regression, #485, as
the get_source method (in the FileStoreLoader) loads the template
(causing IO).

The purpose of #332 was to allow the loader to change whilst ensuring
the correct template was loaded, i.e. to fix this case

    env.loader = loader1
    env.get_template('index.html') # return loader1/index.html
    env.loader = loader2
    env.get_template('index.html') # also return loader1/index.html because of cache

This commit changes the cache key to be a tuple of the id(loader) and
the template name. Therefore fixing the above case without calling the
get_source method and thereby avoiding the IO load.

A test has been added to ensure the above case works as expected, this
required a minor refactor of the caching tests.

9 years agoREADME - fixes (#578)
Adam Chainz [Tue, 3 May 2016 13:13:45 +0000 (14:13 +0100)] 
README - fixes (#578)

* Add syntax highlighting
* Fix build table which doesn't display on Github RST renderer

9 years agouse double ticks for code in rst
David Lord [Mon, 2 May 2016 14:35:44 +0000 (07:35 -0700)] 
use double ticks for code in rst

9 years agoMerge pull request #577 from boidolr/documentation_fixes
Jeff Widman [Mon, 2 May 2016 06:43:25 +0000 (23:43 -0700)] 
Merge pull request #577 from boidolr/documentation_fixes

Small documentation fixes

9 years agoRemove `sudo` command from documentation (fixes #543). 577/head
Raphael Boidol [Sun, 1 May 2016 12:13:40 +0000 (14:13 +0200)] 
Remove `sudo` command from documentation (fixes #543).

Installations should be in a virtualenv.

9 years agoUse constant name in doc (fixes #544)
Raphael Boidol [Sun, 1 May 2016 12:11:26 +0000 (14:11 +0200)] 
Use constant name in doc (fixes #544)

9 years agoMerge pull request #570 from mr-m/patch-1
Sebastian Noack [Tue, 19 Apr 2016 13:53:47 +0000 (15:53 +0200)] 
Merge pull request #570 from mr-m/patch-1

Fix the typo in templates.rst

9 years agoFix the typo 570/head
Dmitriy Trifonov [Tue, 19 Apr 2016 11:29:22 +0000 (17:29 +0600)] 
Fix the typo

9 years agoSuggest installing via Pip (#569)
Jeff Widman [Fri, 15 Apr 2016 14:10:13 +0000 (07:10 -0700)] 
Suggest installing via Pip (#569)

9 years agoMerge pull request #439 from jgmize/title-filter-capitalize-inside-parens
Jeff Widman [Fri, 15 Apr 2016 07:49:40 +0000 (00:49 -0700)] 
Merge pull request #439 from jgmize/title-filter-capitalize-inside-parens

Make title filter capitalize words inside parens and other brackets

9 years agoMerge pull request #473 from snoack/redundant-sorting
Jeff Widman [Fri, 15 Apr 2016 07:00:28 +0000 (00:00 -0700)] 
Merge pull request #473 from snoack/redundant-sorting

Got rid of redundant sorting in groupby filter

9 years agoMerge pull request #470 from snoack/partial-next
Jeff Widman [Fri, 15 Apr 2016 06:57:48 +0000 (23:57 -0700)] 
Merge pull request #470 from snoack/partial-next

Use partial(next, ...) instead get_next()

9 years agoMerge pull request #567 from gpanther/update-gae-example-in-faq
Jeff Widman [Fri, 15 Apr 2016 06:54:42 +0000 (23:54 -0700)] 
Merge pull request #567 from gpanther/update-gae-example-in-faq

Update GAE example code

9 years agoUpdate GAE example code 567/head
Attila-Mihaly Balazs [Thu, 14 Apr 2016 12:56:34 +0000 (15:56 +0300)] 
Update GAE example code

Update the Google App Engine example code to be compatible with the latest google app engine devserver.

9 years agoMerge pull request #500 from snoack/setup-py-versions
Jeff Widman [Wed, 13 Apr 2016 06:01:03 +0000 (23:01 -0700)] 
Merge pull request #500 from snoack/setup-py-versions

Added Python 3.4 and 3.5 to the classifiers in setup.py

9 years agoMerge branch '2.8-maintenance'
Markus Unterwaditzer [Tue, 12 Apr 2016 19:44:39 +0000 (21:44 +0200)] 
Merge branch '2.8-maintenance'

9 years agoChangelog for #466
Markus Unterwaditzer [Tue, 12 Apr 2016 19:44:34 +0000 (21:44 +0200)] 
Changelog for #466

9 years agoMerge branch 'snoack-issue-466' into 2.8-maintenance
Markus Unterwaditzer [Tue, 12 Apr 2016 19:43:27 +0000 (21:43 +0200)] 
Merge branch 'snoack-issue-466' into 2.8-maintenance

Fix #467
Fix #466

9 years agoFixed int() filter for non-string objects #466
Sebastian Noack [Tue, 4 Aug 2015 16:28:42 +0000 (18:28 +0200)] 
Fixed int() filter for non-string objects #466

9 years agostandard tox/travis config
David Lord [Mon, 11 Apr 2016 23:16:43 +0000 (16:16 -0700)] 
standard tox/travis config
fix pytest warning, don't prefix non-testcase classes with Test

9 years agoFixed typo/grammar error (#532)
Kojo Idrissa [Sun, 10 Apr 2016 19:04:46 +0000 (14:04 -0500)] 
Fixed typo/grammar error (#532)

9 years agoUse container-based travis infrastructure (#496)
Adrian [Sun, 10 Apr 2016 16:05:38 +0000 (18:05 +0200)] 
Use container-based travis infrastructure (#496)

9 years agoFix typo (#531)
Guillaume Paumier [Sun, 10 Apr 2016 15:58:06 +0000 (08:58 -0700)] 
Fix typo (#531)

9 years agolink fix (#527)
Abdullah [Sun, 10 Apr 2016 15:57:09 +0000 (18:57 +0300)] 
link fix (#527)

9 years agoChange links for Babel to new docs location. (#562)
Tim Swast [Sun, 10 Apr 2016 15:48:09 +0000 (08:48 -0700)] 
Change links for Babel to new docs location. (#562)

9 years agoEscape target attribute in the urlize function in utils.py. (#507)
Sambhav Satija [Sun, 10 Apr 2016 15:40:38 +0000 (21:10 +0530)] 
Escape target attribute in the urlize function in utils.py. (#507)

9 years agochange from @mitsuhiko to pallets project
José Carlos García [Sun, 3 Apr 2016 23:21:39 +0000 (01:21 +0200)] 
change from @mitsuhiko to pallets project

9 years agoMerge pull request #526 from ioab/master
Armin Ronacher [Mon, 4 Jan 2016 17:15:43 +0000 (18:15 +0100)] 
Merge pull request #526 from ioab/master

docs: Integration link fix

9 years agodocs: Integration link fix 526/head
Abdullah [Mon, 4 Jan 2016 17:13:07 +0000 (20:13 +0300)] 
docs: Integration link fix

9 years agoMerge pull request #523 from alimony/patch-1
Armin Ronacher [Mon, 4 Jan 2016 17:08:36 +0000 (18:08 +0100)] 
Merge pull request #523 from alimony/patch-1

Fix typo.

9 years agoFix typo. 523/head
Markus Amalthea Magnuson [Mon, 28 Dec 2015 16:17:22 +0000 (17:17 +0100)] 
Fix typo.

9 years agoMerge branch '2.8-maintenance'
Armin Ronacher [Fri, 20 Nov 2015 09:05:39 +0000 (10:05 +0100)] 
Merge branch '2.8-maintenance'

9 years agoFixed for_qs for urlencode. This fixes #515
Armin Ronacher [Fri, 20 Nov 2015 09:05:12 +0000 (10:05 +0100)] 
Fixed for_qs for urlencode. This fixes #515

9 years agoThis is 2.8.1-dev
Armin Ronacher [Fri, 20 Nov 2015 09:04:20 +0000 (10:04 +0100)] 
This is 2.8.1-dev

9 years agoMerge pull request #513 from spookylukey/patch-1
Armin Ronacher [Sat, 14 Nov 2015 09:48:20 +0000 (10:48 +0100)] 
Merge pull request #513 from spookylukey/patch-1

Fixed a few spelling mistakes in a docstring

9 years agoFixed a few spelling mistakes in a docstring 513/head
Luke Plant [Sat, 14 Nov 2015 09:46:08 +0000 (09:46 +0000)] 
Fixed a few spelling mistakes in a docstring

9 years agoAdded Python 3.4 and 3.5 to the classifiers in setup.py 500/head
Sebastian Noack [Tue, 6 Oct 2015 14:13:45 +0000 (16:13 +0200)] 
Added Python 3.4 and 3.5 to the classifiers in setup.py

9 years agoMerge pull request #497 from snoack/pypy
Markus Unterwaditzer [Sun, 20 Sep 2015 18:37:37 +0000 (20:37 +0200)] 
Merge pull request #497 from snoack/pypy

Added pypy to the list of Python versions tested by Travis CI

9 years agoAdded pypy to the list of Python versions tested by Travis CI 497/head
Sebastian Noack [Sun, 20 Sep 2015 18:29:34 +0000 (20:29 +0200)] 
Added pypy to the list of Python versions tested by Travis CI

9 years agoDon't pin to .0 version
Markus Unterwaditzer [Sun, 20 Sep 2015 17:43:09 +0000 (19:43 +0200)] 
Don't pin to .0 version

9 years agoMerge pull request #495 from snoack/py35
Markus Unterwaditzer [Sun, 20 Sep 2015 17:42:30 +0000 (19:42 +0200)] 
Merge pull request #495 from snoack/py35

Added Python 3.5 to tox and Travis configuration

9 years agoAdded Python 3.5 to tox and Travis configuration 495/head
Sebastian Noack [Sun, 20 Sep 2015 17:26:05 +0000 (19:26 +0200)] 
Added Python 3.5 to tox and Travis configuration

9 years agoUse partial(next, ...) instead get_next() 470/head
Sebastian Noack [Wed, 5 Aug 2015 10:33:20 +0000 (12:33 +0200)] 
Use partial(next, ...) instead get_next()

10 years agoGot rid of redundant sorting in groupby filter 473/head
Sebastian Noack [Fri, 7 Aug 2015 08:59:01 +0000 (10:59 +0200)] 
Got rid of redundant sorting in groupby filter

10 years agoMerge pull request #472 from pydanny/pydanny-update-django-switch-docs
Markus Unterwaditzer [Thu, 6 Aug 2015 16:02:36 +0000 (18:02 +0200)] 
Merge pull request #472 from pydanny/pydanny-update-django-switch-docs

Remove conditions segment of Django section

10 years agoRemoved outdated condition section on Django 472/head
Daniel Greenfeld [Thu, 6 Aug 2015 15:35:51 +0000 (08:35 -0700)] 
Removed outdated condition section on Django

10 years agoMerge pull request #471 from snoack/metaclass-improvement
Markus Unterwaditzer [Thu, 6 Aug 2015 07:12:34 +0000 (09:12 +0200)] 
Merge pull request #471 from snoack/metaclass-improvement

Improve with_metaclass()

10 years agoImprove with_metaclass() 471/head
Sebastian Noack [Wed, 5 Aug 2015 10:53:07 +0000 (12:53 +0200)] 
Improve with_metaclass()

10 years agoImprove release script to support new format and wheels.
Armin Ronacher [Sun, 26 Jul 2015 17:51:08 +0000 (19:51 +0200)] 
Improve release script to support new format and wheels.

10 years agoThis is 2.9.dev
Armin Ronacher [Sun, 26 Jul 2015 17:50:27 +0000 (19:50 +0200)] 
This is 2.9.dev

10 years agoBump version number to 2.8 2.8
Armin Ronacher [Sun, 26 Jul 2015 17:49:40 +0000 (19:49 +0200)] 
Bump version number to 2.8

10 years agoHardcode version in setup.py again.
Armin Ronacher [Sun, 26 Jul 2015 17:49:32 +0000 (19:49 +0200)] 
Hardcode version in setup.py again.

10 years agoRelease date is today.
Armin Ronacher [Sun, 26 Jul 2015 17:48:17 +0000 (19:48 +0200)] 
Release date is today.

10 years agoMerge pull request #425 from highlyunavailable/master
Armin Ronacher [Sun, 26 Jul 2015 17:45:25 +0000 (19:45 +0200)] 
Merge pull request #425 from highlyunavailable/master

Fix literal \ characters at the end of a string

10 years agoMerge pull request #461 from StevenMaude/patch-1
Markus Unterwaditzer [Sun, 12 Jul 2015 16:35:49 +0000 (18:35 +0200)] 
Merge pull request #461 from StevenMaude/patch-1

Fix typo: "the iterates" > "that iterates"

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 agoMake title filter capitalize words in (),{},[],<> 439/head
Josh Mize [Tue, 7 Apr 2015 20:09:21 +0000 (15:09 -0500)] 
Make title filter capitalize words in (),{},[],<>

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