jinja2.git
14 years agoFixed a scoping bug that caused the immutable scoping rule to be ignored
Armin Ronacher [Mon, 5 Apr 2010 16:43:07 +0000 (18:43 +0200)]
Fixed a scoping bug that caused the immutable scoping rule to be ignored
in a few edge cases.  This clauses #376.

--HG--
branch : trunk

14 years agoAdded missing reference.
Armin Ronacher [Mon, 5 Apr 2010 16:17:27 +0000 (18:17 +0200)]
Added missing reference.

--HG--
branch : trunk

14 years agoautoescape no longer is a plain boolean value but can also be a function
Armin Ronacher [Mon, 5 Apr 2010 16:11:18 +0000 (18:11 +0200)]
autoescape no longer is a plain boolean value but can also be a function
to enable or disable autoescaping for certain filenames (or file
extensions for that matter)

--HG--
branch : trunk

14 years agoAdded improved documentation to the `ContextReference` node.
Armin Ronacher [Wed, 24 Mar 2010 09:53:22 +0000 (10:53 +0100)]
Added improved documentation to the `ContextReference` node.

--HG--
branch : trunk

14 years agoAnother documentation string fix.
Armin Ronacher [Mon, 15 Mar 2010 09:06:53 +0000 (10:06 +0100)]
Another documentation string fix.

--HG--
branch : trunk

14 years agoHopefully fixed EvalContext documentation.
Armin Ronacher [Mon, 15 Mar 2010 08:36:47 +0000 (09:36 +0100)]
Hopefully fixed EvalContext documentation.

--HG--
branch : trunk

14 years agoMore documentation updates.
Armin Ronacher [Mon, 15 Mar 2010 02:06:04 +0000 (03:06 +0100)]
More documentation updates.

--HG--
branch : trunk

14 years agoUpdated copyright. It's 2010!
Armin Ronacher [Mon, 15 Mar 2010 01:49:22 +0000 (02:49 +0100)]
Updated copyright. It's 2010!

--HG--
branch : trunk

14 years agoDocumented autoescaping behavior and eval contexts.
Armin Ronacher [Mon, 15 Mar 2010 01:42:41 +0000 (02:42 +0100)]
Documented autoescaping behavior and eval contexts.

--HG--
branch : trunk

14 years agoTemplate to module compilation should work on 3.x now.
Armin Ronacher [Sun, 14 Mar 2010 23:54:01 +0000 (00:54 +0100)]
Template to module compilation should work on 3.x now.

--HG--
branch : trunk

14 years agoFixed a testcase for Python 2.4
Armin Ronacher [Sun, 14 Mar 2010 23:48:46 +0000 (00:48 +0100)]
Fixed a testcase for Python 2.4

--HG--
branch : trunk

14 years agoMore testcaseeees :)
Armin Ronacher [Sun, 14 Mar 2010 23:42:27 +0000 (00:42 +0100)]
More testcaseeees :)

--HG--
branch : trunk

14 years agoAdded another testcase and fixed a bug with the volatile scoping.
Armin Ronacher [Sun, 14 Mar 2010 23:26:05 +0000 (00:26 +0100)]
Added another testcase and fixed a bug with the volatile scoping.

--HG--
branch : trunk

14 years agoAdded a new testcase for something that is supposed to be a bug.
Armin Ronacher [Sun, 14 Mar 2010 23:03:25 +0000 (00:03 +0100)]
Added a new testcase for something that is supposed to be a bug.

--HG--
branch : trunk

14 years agoBiggest change to Jinja since the 1.x migration: added evaluation contexts
Armin Ronacher [Sun, 14 Mar 2010 18:43:47 +0000 (19:43 +0100)]
Biggest change to Jinja since the 1.x migration: added evaluation contexts
which make it possible to keep the ahead of time optimizations and provide
dynamic activation and deactivation of autoescaping and other context
specific features.

--HG--
branch : trunk

14 years agoImproved tests and template compilation.
Armin Ronacher [Fri, 12 Mar 2010 16:59:51 +0000 (17:59 +0100)]
Improved tests and template compilation.

--HG--
branch : trunk

14 years agoJust in case there is no gc module.
Armin Ronacher [Fri, 12 Mar 2010 02:37:03 +0000 (03:37 +0100)]
Just in case there is no gc module.

--HG--
branch : trunk

14 years agoStreamlined code. Removed an unnecessary leftover.
Armin Ronacher [Fri, 12 Mar 2010 02:27:33 +0000 (03:27 +0100)]
Streamlined code.  Removed an unnecessary leftover.

--HG--
branch : trunk

14 years agoadded a :class:`ModuleLoader` that can load templates from
Armin Ronacher [Fri, 12 Mar 2010 02:17:41 +0000 (03:17 +0100)]
added a :class:`ModuleLoader` that can load templates from
precompiled sources.  The environment now features a method
to compile the templates from a configured loader into a zip
file or folder.

--HG--
branch : trunk
extra : rebase_source : 4824f663e4ff58ca3d2176c65fc1b7494e1f0c43

14 years agoMake the _speedups extension compatible with Python 3.
Georg Brandl [Sun, 21 Feb 2010 16:50:32 +0000 (17:50 +0100)]
Make the _speedups extension compatible with Python 3.

--HG--
branch : trunk

14 years agoFix test in Python 3.2 -- the exception message changed.
Georg Brandl [Sun, 21 Feb 2010 16:49:04 +0000 (17:49 +0100)]
Fix test in Python 3.2 -- the exception message changed.

--HG--
branch : trunk

14 years agoMerged in 2.3.1 release fixes
Armin Ronacher [Fri, 19 Feb 2010 12:40:23 +0000 (13:40 +0100)]
Merged in 2.3.1 release fixes

--HG--
branch : trunk

14 years agoAdded tag 2.3.1 for changeset 140c54afc249
Armin Ronacher [Fri, 19 Feb 2010 12:37:33 +0000 (13:37 +0100)]
Added tag 2.3.1 for changeset 140c54afc249

--HG--
branch : trunk

14 years agoUntagged 2.3.1 and fixed setup.py for a new release 2.3.1
Armin Ronacher [Fri, 19 Feb 2010 12:37:28 +0000 (13:37 +0100)]
Untagged 2.3.1 and fixed setup.py for a new release

--HG--
branch : trunk

14 years agomerged with 2.3-maintenance
Armin Ronacher [Fri, 19 Feb 2010 10:10:32 +0000 (11:10 +0100)]
merged with 2.3-maintenance

--HG--
branch : trunk

14 years agoAdded changelog
Armin Ronacher [Fri, 19 Feb 2010 10:09:28 +0000 (11:09 +0100)]
Added changelog

--HG--
branch : trunk

14 years agoMerged 2.3.1 in
Armin Ronacher [Thu, 18 Feb 2010 23:01:18 +0000 (00:01 +0100)]
Merged 2.3.1 in

--HG--
branch : trunk

14 years agoAdded tag 2.3.1 for changeset 53f4dc68cec0
Armin Ronacher [Thu, 18 Feb 2010 22:59:57 +0000 (23:59 +0100)]
Added tag 2.3.1 for changeset 53f4dc68cec0

--HG--
branch : trunk

14 years agoMerged in changes from 2.3.1
Armin Ronacher [Wed, 17 Feb 2010 07:02:52 +0000 (08:02 +0100)]
Merged in changes from 2.3.1

--HG--
branch : trunk

14 years agoPushed version number in setup.py for 2.3.1 release.
Armin Ronacher [Wed, 17 Feb 2010 07:01:10 +0000 (08:01 +0100)]
Pushed version number in setup.py for 2.3.1 release.

--HG--
branch : trunk

14 years agoFixed some tests for python 2.4. Disabled a test for 2.4 that does not work because...
Armin Ronacher [Wed, 17 Feb 2010 06:59:38 +0000 (07:59 +0100)]
Fixed some tests for python 2.4.  Disabled a test for 2.4 that does not work because of a python limitation.

--HG--
branch : trunk

14 years agobroke a line into two. (test commit)
Armin Ronacher [Tue, 16 Feb 2010 23:52:42 +0000 (00:52 +0100)]
broke a line into two. (test commit)

--HG--
branch : trunk

14 years agoThe jdebug file should have a 2010 copyright as well.
Armin Ronacher [Tue, 16 Feb 2010 23:30:01 +0000 (00:30 +0100)]
The jdebug file should have a 2010 copyright as well.

--HG--
branch : trunk

14 years agoRemoved unnecessary runtime check. Our 2to3 fixer fixes that
Armin Ronacher [Tue, 16 Feb 2010 23:25:14 +0000 (00:25 +0100)]
Removed unnecessary runtime check.  Our 2to3 fixer fixes that
automatically now.

--HG--
branch : trunk

14 years agoReindented a docstring.
Armin Ronacher [Tue, 16 Feb 2010 23:16:07 +0000 (00:16 +0100)]
Reindented a docstring.

--HG--
branch : trunk

14 years agobetter wording and test commit.
Armin Ronacher [Tue, 16 Feb 2010 22:34:45 +0000 (23:34 +0100)]
better wording and test commit.

--HG--
branch : trunk

14 years agoDocumented the API changes in get_template and select_template.
Armin Ronacher [Tue, 16 Feb 2010 16:37:17 +0000 (17:37 +0100)]
Documented the API changes in get_template and select_template.

--HG--
branch : trunk

14 years agothe environment template loading functions now transparently
Armin Ronacher [Tue, 16 Feb 2010 16:35:59 +0000 (17:35 +0100)]
the environment template loading functions now transparently
pass through a template object if it was passed to it.  This
makes it possible to import or extend from a template object
that was passed to the template.

--HG--
branch : trunk

14 years agoported fix for #368 from maintenance branch.
Armin Ronacher [Thu, 11 Feb 2010 13:29:47 +0000 (14:29 +0100)]
ported fix for #368 from maintenance branch.

--HG--
branch : trunk

14 years agoThis fixes #368.
Armin Ronacher [Thu, 11 Feb 2010 13:27:23 +0000 (14:27 +0100)]
This fixes #368.

--HG--
branch : trunk

14 years agotip is 2.4
Armin Ronacher [Wed, 10 Feb 2010 01:23:56 +0000 (02:23 +0100)]
tip is 2.4

--HG--
branch : trunk

14 years agoAdded tag 2.3 for changeset 2eb624b634a6
Armin Ronacher [Wed, 10 Feb 2010 01:19:39 +0000 (02:19 +0100)]
Added tag 2.3 for changeset 2eb624b634a6

--HG--
branch : trunk

14 years agoUntagged and added python 3 category. 2.3
Armin Ronacher [Wed, 10 Feb 2010 01:19:17 +0000 (02:19 +0100)]
Untagged and added python 3 category.

--HG--
branch : trunk

14 years agoAdded tag 2.3 for changeset be1b1d6ac4fc
Armin Ronacher [Wed, 10 Feb 2010 01:17:46 +0000 (02:17 +0100)]
Added tag 2.3 for changeset be1b1d6ac4fc

--HG--
branch : trunk

14 years agoReady for release
Armin Ronacher [Wed, 10 Feb 2010 01:17:35 +0000 (02:17 +0100)]
Ready for release

--HG--
branch : trunk

14 years agoBroke a test for 2.x :)
Armin Ronacher [Wed, 10 Feb 2010 01:13:51 +0000 (02:13 +0100)]
Broke a test for 2.x :)

--HG--
branch : trunk

14 years agoAdded Python 3 section to the documentation.
Armin Ronacher [Wed, 10 Feb 2010 01:10:48 +0000 (02:10 +0100)]
Added Python 3 section to the documentation.

--HG--
branch : trunk

14 years agoDocumentation recommends distribute now.
Armin Ronacher [Wed, 10 Feb 2010 01:06:06 +0000 (02:06 +0100)]
Documentation recommends distribute now.

--HG--
branch : trunk

14 years agoALL TESTS PASS!
Armin Ronacher [Wed, 10 Feb 2010 01:02:31 +0000 (02:02 +0100)]
ALL TESTS PASS!

--HG--
branch : trunk

14 years agoDown to 7 failures for Python 3. We're onto something.
Armin Ronacher [Wed, 10 Feb 2010 00:35:13 +0000 (01:35 +0100)]
Down to 7 failures for Python 3. We're onto something.

--HG--
branch : trunk

14 years agoAdded comment to why __unicode__ goes after __str__.
Armin Ronacher [Tue, 9 Feb 2010 23:07:43 +0000 (00:07 +0100)]
Added comment to why __unicode__ goes after __str__.

--HG--
branch : trunk

14 years agoApproaching python3 compatibility
Armin Ronacher [Tue, 9 Feb 2010 23:05:46 +0000 (00:05 +0100)]
Approaching python3 compatibility

--HG--
branch : trunk

14 years agoRemoved old testsuite.
Armin Ronacher [Tue, 9 Feb 2010 20:27:54 +0000 (21:27 +0100)]
Removed old testsuite.

--HG--
branch : trunk

14 years agoRemoved useless prints.
Armin Ronacher [Tue, 9 Feb 2010 20:27:14 +0000 (21:27 +0100)]
Removed useless prints.

--HG--
branch : trunk

14 years agoAdded doctests, hooked up all tests. Yay!
Armin Ronacher [Tue, 9 Feb 2010 20:25:44 +0000 (21:25 +0100)]
Added doctests, hooked up all tests. Yay!

--HG--
branch : trunk

14 years agoRest of tests ported, just need to hook up doctests now.
Armin Ronacher [Tue, 9 Feb 2010 20:14:16 +0000 (21:14 +0100)]
Rest of tests ported, just need to hook up doctests now.

--HG--
branch : trunk

14 years agoAdded the security tests.
Armin Ronacher [Tue, 9 Feb 2010 17:06:32 +0000 (18:06 +0100)]
Added the security tests.

--HG--
branch : trunk

14 years agoFixed some tests, added syntax test.
Armin Ronacher [Tue, 9 Feb 2010 16:21:19 +0000 (17:21 +0100)]
Fixed some tests, added syntax test.

--HG--
branch : trunk

14 years agoHalftime, lexer and parser tests added.
Armin Ronacher [Tue, 9 Feb 2010 16:13:30 +0000 (17:13 +0100)]
Halftime, lexer and parser tests added.

--HG--
branch : trunk

14 years agoAnd import tests :)
Armin Ronacher [Tue, 9 Feb 2010 15:52:49 +0000 (16:52 +0100)]
And import tests :)

--HG--
branch : trunk

14 years agoAdded inheritance tests.
Armin Ronacher [Tue, 9 Feb 2010 15:48:10 +0000 (16:48 +0100)]
Added inheritance tests.

--HG--
branch : trunk

14 years agoAdded tests for the test functions (the jinja ones ^^)
Armin Ronacher [Tue, 9 Feb 2010 15:43:12 +0000 (16:43 +0100)]
Added tests for the test functions (the jinja ones ^^)

--HG--
branch : trunk

14 years agoAdded loader tests.
Armin Ronacher [Tue, 9 Feb 2010 15:35:08 +0000 (16:35 +0100)]
Added loader tests.

--HG--
branch : trunk

14 years agoPorted for tests
Armin Ronacher [Tue, 9 Feb 2010 15:15:09 +0000 (16:15 +0100)]
Ported for tests

--HG--
branch : trunk

14 years agoStarted working on unittest powered testsuite.
Armin Ronacher [Tue, 9 Feb 2010 15:05:08 +0000 (16:05 +0100)]
Started working on unittest powered testsuite.

--HG--
branch : trunk

14 years agoPropably delaying release for better python 3 support. Started working on
Armin Ronacher [Tue, 9 Feb 2010 14:04:51 +0000 (15:04 +0100)]
Propably delaying release for better python 3 support. Started working on
that.

--HG--
branch : trunk

14 years agoexperimental Python 3 support.
Armin Ronacher [Tue, 9 Feb 2010 01:09:10 +0000 (02:09 +0100)]
experimental Python 3 support.

--HG--
branch : trunk

14 years agoSome tiny documentation fixes (unicode -> Unicode)
Armin Ronacher [Tue, 9 Feb 2010 00:31:47 +0000 (01:31 +0100)]
Some tiny documentation fixes (unicode -> Unicode)

--HG--
branch : trunk

14 years agoPrefixLoader raises correct error message now. This fixes #358.
Armin Ronacher [Tue, 9 Feb 2010 00:27:57 +0000 (01:27 +0100)]
PrefixLoader raises correct error message now.  This fixes #358.

--HG--
branch : trunk

14 years agoadded with-statement extension.
Armin Ronacher [Sun, 7 Feb 2010 02:55:15 +0000 (03:55 +0100)]
added with-statement extension.

--HG--
branch : trunk

14 years agoImproved test invokation. Picks up doctests within Jinja now, changed
Armin Ronacher [Sun, 7 Feb 2010 01:00:11 +0000 (02:00 +0100)]
Improved test invokation. Picks up doctests within Jinja now, changed
doctests that just show usage that would not work on their own so that
they are standard code blocks now and do not disturb testing.

--HG--
branch : trunk

14 years agoFurther error message improvement, this time for #341.
Armin Ronacher [Sun, 7 Feb 2010 00:27:47 +0000 (01:27 +0100)]
Further error message improvement, this time for #341.

--HG--
branch : trunk

14 years agoFixed bug in a testcase.
Armin Ronacher [Sun, 7 Feb 2010 00:27:34 +0000 (01:27 +0100)]
Fixed bug in a testcase.

--HG--
branch : trunk

14 years agoFixed #367 by improving the documentation.
Armin Ronacher [Sat, 6 Feb 2010 22:33:11 +0000 (23:33 +0100)]
Fixed #367 by improving the documentation.

--HG--
branch : trunk

14 years agoAdded a testcase for #363. This bug was fixed along the way.
Armin Ronacher [Sat, 6 Feb 2010 18:01:58 +0000 (19:01 +0100)]
Added a testcase for #363.  This bug was fixed along the way.

--HG--
branch : trunk

14 years agoDocumentation no longer mentiones "no multiple inheritance" support. that
Armin Ronacher [Sat, 6 Feb 2010 17:02:13 +0000 (18:02 +0100)]
Documentation no longer mentiones "no multiple inheritance" support. that
just confuses people.

--HG--
branch : trunk

14 years agoFixed typo in documentation.
Armin Ronacher [Sat, 6 Feb 2010 15:36:52 +0000 (16:36 +0100)]
Fixed typo in documentation.

--HG--
branch : trunk

14 years agoadded support for translator comments if extracted via babel.
Armin Ronacher [Sat, 6 Feb 2010 15:34:54 +0000 (16:34 +0100)]
added support for translator comments if extracted via babel.

--HG--
branch : trunk

14 years agoRaise version number.
Armin Ronacher [Sat, 6 Feb 2010 14:30:44 +0000 (15:30 +0100)]
Raise version number.

--HG--
branch : trunk

14 years agoimplicit tuple expressions can no longer be totally empty.
Armin Ronacher [Sat, 6 Feb 2010 14:04:46 +0000 (15:04 +0100)]
implicit tuple expressions can no longer be totally empty.
This change makes ``{% if %}...{% endif %}`` a syntax error
now. (#364)

--HG--
branch : trunk

14 years agogreatly improved error message reporting. This fixes #339
Armin Ronacher [Sat, 6 Feb 2010 13:01:26 +0000 (14:01 +0100)]
greatly improved error message reporting.  This fixes #339

--HG--
branch : trunk
extra : rebase_source : d8f677273490fa73d5603b68478fa3b54f60ccb9

14 years agoImproved finalize documentation.
Armin Ronacher [Sun, 24 Jan 2010 13:29:26 +0000 (14:29 +0100)]
Improved finalize documentation.

--HG--
branch : trunk

14 years agoIt's a new year
Armin Ronacher [Fri, 22 Jan 2010 08:41:48 +0000 (09:41 +0100)]
It's a new year

--HG--
branch : trunk

14 years agoMore correct fix for 380. The only thing that is part of the outer scope
Armin Ronacher [Thu, 14 Jan 2010 00:26:40 +0000 (01:26 +0100)]
More correct fix for 380.  The only thing that is part of the outer scope
is the name of the thing to call.  Though because it will never be able to
track store nodes, the one before should not do harm either.

--HG--
branch : trunk

14 years agofixed a problem with having call blocks in outer scopes that
Armin Ronacher [Thu, 14 Jan 2010 00:20:46 +0000 (01:20 +0100)]
fixed a problem with having call blocks in outer scopes that
have an argument that is also used as local variable in an
inner frame [#360].

--HG--
branch : trunk

14 years agoJust to be on the sure side with that compiler optimization magic
Armin Ronacher [Wed, 13 Jan 2010 23:59:31 +0000 (00:59 +0100)]
Just to be on the sure side with that compiler optimization magic

--HG--
branch : trunk

14 years agoFixed the choice include tests.
Armin Ronacher [Wed, 13 Jan 2010 23:54:47 +0000 (00:54 +0100)]
Fixed the choice include tests.

--HG--
branch : trunk

14 years agoinclude tags are now able to select between multiple templates
Armin Ronacher [Wed, 13 Jan 2010 23:41:30 +0000 (00:41 +0100)]
include tags are now able to select between multiple templates
and take the first that exists, if a list of templates is
given.

--HG--
branch : trunk

15 years agoFix typos and one extra import.
Georg Brandl [Sun, 22 Nov 2009 17:35:18 +0000 (18:35 +0100)]
Fix typos and one extra import.

--HG--
branch : trunk

15 years agoReverted [73b04625ab54]. The old behavior is the new behavior, the other
Armin Ronacher [Mon, 26 Oct 2009 10:53:27 +0000 (11:53 +0100)]
Reverted [73b04625ab54].  The old behavior is the new behavior, the other
is not consistenly implementable.

--HG--
branch : trunk

15 years agoShortcut for the if inner visit for empty branches.
Armin Ronacher [Sun, 25 Oct 2009 12:03:08 +0000 (13:03 +0100)]
Shortcut for the if inner visit for empty branches.

--HG--
branch : trunk

15 years agoAutomated merge with ssh://team@pocoo.org/jinja2-main
Armin Ronacher [Sun, 25 Oct 2009 11:46:41 +0000 (12:46 +0100)]
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk

15 years agoFixed a scoping bug that was introduced in the development version and was
Armin Ronacher [Sun, 25 Oct 2009 11:46:31 +0000 (12:46 +0100)]
Fixed a scoping bug that was introduced in the development version and was
triggered by multiple layers of local variables not tracked properly in if
statements.

--HG--
branch : trunk

15 years agoFix typo.
Georg Brandl [Mon, 19 Oct 2009 19:17:53 +0000 (21:17 +0200)]
Fix typo.

--HG--
branch : trunk

15 years agoadded a deprecation warning for a variable assignment, scope bug
Armin Ronacher [Fri, 18 Sep 2009 17:32:46 +0000 (19:32 +0200)]
added a deprecation warning for a variable assignment, scope bug
that exists since 2.0, code could depend on.  See :ref:`jinja-scoping-bug`
for more information on this problem.

Tip is 2.3 as this will be the next release (will happen soon!)

--HG--
branch : trunk

15 years agofixes issue with code generator that causes unbound variables
Armin Ronacher [Wed, 16 Sep 2009 22:48:41 +0000 (00:48 +0200)]
fixes issue with code generator that causes unbound variables
to be generated if set was used in if-blocks.

--HG--
branch : trunk

15 years agoTip is 2.3
Armin Ronacher [Mon, 14 Sep 2009 21:59:18 +0000 (14:59 -0700)]
Tip is 2.3

--HG--
branch : trunk

15 years agoAdded tag 2.2.1 for changeset b987be13b8f6
Armin Ronacher [Mon, 14 Sep 2009 21:58:16 +0000 (14:58 -0700)]
Added tag 2.2.1 for changeset b987be13b8f6

--HG--
branch : trunk

15 years agofixes some smaller problems for Jinja2 on Jython. 2.2.1
Armin Ronacher [Mon, 14 Sep 2009 21:58:01 +0000 (14:58 -0700)]
fixes some smaller problems for Jinja2 on Jython.

--HG--
branch : trunk

15 years agoMade the lru cache more robust.
Armin Ronacher [Mon, 14 Sep 2009 19:20:33 +0000 (12:20 -0700)]
Made the lru cache more robust.

--HG--
branch : trunk