jinja2.git
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

14 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

14 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

14 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

14 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

14 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

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

--HG--
branch : trunk

14 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

14 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

14 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

14 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

14 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

14 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

14 years agoTiny improvement for the loop hack. Implemented it in a way that the
Armin Ronacher [Sun, 13 Sep 2009 22:56:58 +0000 (15:56 -0700)]
Tiny improvement for the loop hack.  Implemented it in a way that the
frame is not modified in the macro body generator.

--HG--
branch : trunk

14 years agoClarified copyrights.
Armin Ronacher [Sun, 13 Sep 2009 17:54:37 +0000 (10:54 -0700)]
Clarified copyrights.

--HG--
branch : trunk

14 years agoFixed the install docs.
Armin Ronacher [Sun, 13 Sep 2009 17:35:54 +0000 (10:35 -0700)]
Fixed the install docs.

--HG--
branch : trunk

14 years agospeedup extension is now disabled by default (added message) and fixed a
Armin Ronacher [Sun, 13 Sep 2009 17:26:39 +0000 (10:26 -0700)]
speedup extension is now disabled by default (added message) and fixed a
line in the docs.

--HG--
branch : trunk

14 years agoImproved wording in the CHANGES file.
Armin Ronacher [Sun, 13 Sep 2009 07:46:59 +0000 (00:46 -0700)]
Improved wording in the CHANGES file.

--HG--
branch : trunk

14 years agoAdded tag 2.2 for changeset f20ea8e724a0
Armin Ronacher [Sun, 13 Sep 2009 07:30:13 +0000 (00:30 -0700)]
Added tag 2.2 for changeset f20ea8e724a0

--HG--
branch : trunk

14 years agoDisabled speedups by default. 2.2
Armin Ronacher [Sun, 13 Sep 2009 07:30:06 +0000 (00:30 -0700)]
Disabled speedups by default.

--HG--
branch : trunk

14 years agoAdded tag 2.2 for changeset 41c2aca50afd
Armin Ronacher [Sun, 13 Sep 2009 07:25:11 +0000 (00:25 -0700)]
Added tag 2.2 for changeset 41c2aca50afd

--HG--
branch : trunk

14 years agoUpdated changes.
Armin Ronacher [Sun, 13 Sep 2009 07:23:57 +0000 (00:23 -0700)]
Updated changes.

--HG--
branch : trunk

14 years ago(codename Kong, released on September 12th 2009)
Armin Ronacher [Sun, 13 Sep 2009 07:23:27 +0000 (00:23 -0700)]
(codename Kong, released on September 12th 2009)

--HG--
branch : trunk

14 years agoRefactoring in the way the parse function is invoked.
Armin Ronacher [Sun, 13 Sep 2009 07:22:50 +0000 (00:22 -0700)]
Refactoring in the way the parse function is invoked.

--HG--
branch : trunk

14 years agoAdded ugly workaround for a loop bug.
Armin Ronacher [Sun, 13 Sep 2009 06:48:18 +0000 (23:48 -0700)]
Added ugly workaround for a loop bug.

--HG--
branch : trunk

14 years agoAdded tornado templates to benchmark.
Armin Ronacher [Thu, 10 Sep 2009 20:58:52 +0000 (13:58 -0700)]
Added tornado templates to benchmark.

--HG--
branch : trunk

14 years agoMore Python 3 support.
Armin Ronacher [Wed, 5 Aug 2009 18:25:06 +0000 (20:25 +0200)]
More Python 3 support.

--HG--
branch : trunk

14 years agoStarted to work on Python 3 support.
Armin Ronacher [Wed, 5 Aug 2009 16:45:39 +0000 (18:45 +0200)]
Started to work on Python 3 support.

--HG--
branch : trunk

14 years agoUnicode support for wordcount.
Armin Ronacher [Wed, 5 Aug 2009 16:07:13 +0000 (18:07 +0200)]
Unicode support for wordcount.

--HG--
branch : trunk

14 years agoAdded unittests for meta.
Armin Ronacher [Sun, 26 Jul 2009 09:48:41 +0000 (11:48 +0200)]
Added unittests for meta.

--HG--
branch : trunk

14 years agoNever forget about contributors. Thanks Rene for porting the testsuite to
Armin Ronacher [Sun, 26 Jul 2009 09:11:47 +0000 (11:11 +0200)]
Never forget about contributors.  Thanks Rene for porting the testsuite to
nose.

--HG--
branch : trunk

14 years agofab -> make
Armin Ronacher [Sun, 26 Jul 2009 09:08:57 +0000 (11:08 +0200)]
fab -> make

--HG--
branch : trunk

14 years agoGot rid of py.testisms.
Armin Ronacher [Sun, 26 Jul 2009 09:08:50 +0000 (11:08 +0200)]
Got rid of py.testisms.

--HG--
branch : trunk

14 years agomerged.
Armin Ronacher [Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)]
merged.

--HG--
branch : trunk

14 years agomerged.
Armin Ronacher [Sun, 26 Jul 2009 08:35:04 +0000 (10:35 +0200)]
merged.

--HG--
branch : trunk

14 years agoAdded missing module.
Armin Ronacher [Sun, 26 Jul 2009 08:34:18 +0000 (10:34 +0200)]
Added missing module.

--HG--
branch : trunk

14 years agoAdded the `meta` module.
Armin Ronacher [Sun, 26 Jul 2009 08:33:36 +0000 (10:33 +0200)]
Added the `meta` module.

--HG--
branch : trunk

14 years agoRenamed (undocumented) attribute overlay to overlayed on the environment
Armin Ronacher [Thu, 9 Jul 2009 19:55:29 +0000 (21:55 +0200)]
Renamed (undocumented) attribute overlay to overlayed on the environment
because it was clashing with a method of the same name.  The new attribute
is called "overlayed".

--HG--
branch : trunk

14 years agoAutomated merge with ssh://team@pocoo.org/jinja2-main
Armin Ronacher [Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)]
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk

14 years agoexplanation for a strange monkey patch in django2jinja (thanks djc)
Armin Ronacher [Tue, 7 Jul 2009 11:22:34 +0000 (13:22 +0200)]
explanation for a strange monkey patch in django2jinja (thanks djc)

--HG--
branch : trunk

15 years agoMerged
Armin Ronacher [Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)]
Merged

--HG--
branch : trunk

15 years agotypo fix
Christopher Denter [Sun, 3 May 2009 10:57:08 +0000 (12:57 +0200)]
typo fix

--HG--
branch : trunk

15 years agoAutomated merge with ssh://team@pocoo.org/jinja2-main
Armin Ronacher [Sat, 2 May 2009 12:22:41 +0000 (14:22 +0200)]
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk

15 years agoFixed typo.
Armin Ronacher [Sat, 2 May 2009 12:22:32 +0000 (14:22 +0200)]
Fixed typo.

--HG--
branch : trunk

15 years agoImproved changelog rendering
Armin Ronacher [Tue, 28 Apr 2009 00:05:14 +0000 (02:05 +0200)]
Improved changelog rendering

--HG--
branch : trunk

15 years agoFix typo. Closes #343
Christopher Denter [Mon, 27 Apr 2009 23:50:32 +0000 (01:50 +0200)]
Fix typo. Closes #343

--HG--
branch : trunk

15 years agoSupport nose framework for the whole test suite.
Rene Leonhardt [Mon, 20 Apr 2009 21:08:53 +0000 (23:08 +0200)]
Support nose framework for the whole test suite.

--HG--
branch : trunk

15 years agoFixed a bug in jinja2/debug (second time, forgot to merge and threw away changes...
Armin Ronacher [Fri, 17 Apr 2009 09:21:00 +0000 (11:21 +0200)]
Fixed a bug in jinja2/debug (second time, forgot to merge and threw away changes -.-)

--HG--
branch : trunk

15 years agoRemoved print statement left in the code
Armin Ronacher [Thu, 16 Apr 2009 22:10:48 +0000 (00:10 +0200)]
Removed print statement left in the code

--HG--
branch : trunk

15 years agoResolved conflict
Armin Ronacher [Thu, 16 Apr 2009 21:17:43 +0000 (23:17 +0200)]
Resolved conflict

--HG--
branch : trunk

15 years agoFixed a bug with template syntax errors not handled properly.
Armin Ronacher [Thu, 16 Apr 2009 21:15:22 +0000 (23:15 +0200)]
Fixed a bug with template syntax errors not handled properly.

--HG--
branch : trunk

15 years agoDocumented more changes
Armin Ronacher [Thu, 2 Apr 2009 12:04:41 +0000 (14:04 +0200)]
Documented more changes

--HG--
branch : trunk

15 years agoStarted refactoring of debugging system for better AppEngine/Pylons support.
Armin Ronacher [Thu, 5 Mar 2009 22:47:00 +0000 (23:47 +0100)]
Started refactoring of debugging system for better AppEngine/Pylons support.

--HG--
branch : trunk
extra : rebase_source : 30b87a402e0847f95eaf277d0fc50e1a63177d5b

15 years agoMoved tmbundle into tarfile (does not check out properly on windows)
Armin Ronacher [Thu, 2 Apr 2009 12:36:56 +0000 (14:36 +0200)]
Moved tmbundle into tarfile (does not check out properly on windows)

--HG--
branch : trunk

15 years agoBroken overlong line.
Armin Ronacher [Thu, 2 Apr 2009 12:14:30 +0000 (14:14 +0200)]
Broken overlong line.

--HG--
branch : trunk

15 years agoAdded a testcase for the last change.
Armin Ronacher [Wed, 1 Apr 2009 17:17:31 +0000 (19:17 +0200)]
Added a testcase for the last change.

--HG--
branch : trunk

15 years agoFixed another bug with line comments
Armin Ronacher [Wed, 1 Apr 2009 17:16:25 +0000 (19:16 +0200)]
Fixed another bug with line comments

--HG--
branch : trunk

15 years agoFixed bug in line-based comments with priority.
Armin Ronacher [Tue, 31 Mar 2009 21:51:56 +0000 (23:51 +0200)]
Fixed bug in line-based comments with priority.

--HG--
branch : trunk

15 years agoAdded support for line-based comments.
Armin Ronacher [Mon, 30 Mar 2009 19:00:16 +0000 (21:00 +0200)]
Added support for line-based comments.

--HG--
branch : trunk

15 years agoAdded testcase for #335
Armin Ronacher [Mon, 30 Mar 2009 16:50:49 +0000 (18:50 +0200)]
Added testcase for #335

--HG--
branch : trunk

15 years agoApplied documentation patches by Clemens Hermann.
Armin Ronacher [Wed, 18 Mar 2009 00:01:36 +0000 (01:01 +0100)]
Applied documentation patches by Clemens Hermann.

--HG--
branch : trunk

15 years agoAdded testcase for a bug
Armin Ronacher [Tue, 17 Mar 2009 23:59:32 +0000 (00:59 +0100)]
Added testcase for a bug

--HG--
branch : trunk

15 years agoStarted refactoring of debugging system for better AppEngine/Pylons support.
Armin Ronacher [Thu, 5 Mar 2009 22:47:00 +0000 (23:47 +0100)]
Started refactoring of debugging system for better AppEngine/Pylons support.

--HG--
branch : trunk

15 years agoImproved Jinja's debugging support by introducing "@internalcode" which marks code...
Armin Ronacher [Tue, 24 Feb 2009 21:58:00 +0000 (22:58 +0100)]
Improved Jinja's debugging support by introducing "@internalcode" which marks code objects that are skipped on tracebacks.  Also template errors are now translated as well to help the pylons debugger.

--HG--
branch : trunk

15 years agoAdded a (ugly) hack to the exceptions so that they don't warn under 2.6
Armin Ronacher [Thu, 19 Feb 2009 19:07:13 +0000 (20:07 +0100)]
Added a (ugly) hack to the exceptions so that they don't warn under 2.6

--HG--
branch : trunk

15 years agojinja2.sandbox should not warn on 2.6 any more.
Armin Ronacher [Thu, 19 Feb 2009 18:57:01 +0000 (19:57 +0100)]
jinja2.sandbox should not warn on 2.6 any more.

--HG--
branch : trunk

15 years agoAdded proper super() support for scoped blocks.
Armin Ronacher [Thu, 19 Feb 2009 15:11:11 +0000 (16:11 +0100)]
Added proper super() support for scoped blocks.

--HG--
branch : trunk

15 years agoAdded support for optional `scoped` modifier to blocks.
Armin Ronacher [Thu, 19 Feb 2009 14:56:53 +0000 (15:56 +0100)]
Added support for optional `scoped` modifier to blocks.

--HG--
branch : trunk

15 years agoFixed a bug that caused internal errors if names where used as iteration
Armin Ronacher [Wed, 11 Feb 2009 21:49:08 +0000 (22:49 +0100)]
Fixed a bug that caused internal errors if names where used as iteration
variable and regular variable *after* the loop if that variable was unused
*before* the loop.  (#331)

--HG--
branch : trunk

15 years agoMade it possible to refer to names from outer scopes in included templates
Armin Ronacher [Sun, 8 Feb 2009 18:11:44 +0000 (19:11 +0100)]
Made it possible to refer to names from outer scopes in included templates
that were unused in the callers frame (#327).

--HG--
branch : trunk

15 years agoFixed a documenation bug in the cache extension.
Armin Ronacher [Sun, 8 Feb 2009 10:11:57 +0000 (11:11 +0100)]
Fixed a documenation bug in the cache extension.

--HG--
branch : trunk

15 years agoFixed a bug in the parser that made ``{{ foo[1, 2] }}`` impossible.
Armin Ronacher [Thu, 5 Feb 2009 22:13:15 +0000 (23:13 +0100)]
Fixed a bug in the parser that made ``{{ foo[1, 2] }}`` impossible.

--HG--
branch : trunk

15 years agoImproved usage of string interning. This should fix the problems with jython.
Armin Ronacher [Wed, 4 Feb 2009 18:33:58 +0000 (19:33 +0100)]
Improved usage of string interning.  This should fix the problems with jython.

--HG--
branch : trunk