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
Armin Ronacher [Wed, 13 Jan 2010 23:54:47 +0000 (00:54 +0100)]
Fixed the choice include tests.
--HG--
branch : trunk
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
Georg Brandl [Sun, 22 Nov 2009 17:35:18 +0000 (18:35 +0100)]
Fix typos and one extra import.
--HG--
branch : trunk
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
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
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
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
Georg Brandl [Mon, 19 Oct 2009 19:17:53 +0000 (21:17 +0200)]
Fix typo.
--HG--
branch : trunk
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
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
Armin Ronacher [Mon, 14 Sep 2009 21:59:18 +0000 (14:59 -0700)]
Tip is 2.3
--HG--
branch : trunk
Armin Ronacher [Mon, 14 Sep 2009 21:58:16 +0000 (14:58 -0700)]
Added tag 2.2.1 for changeset
b987be13b8f6
--HG--
branch : trunk
Armin Ronacher [Mon, 14 Sep 2009 21:58:01 +0000 (14:58 -0700)]
fixes some smaller problems for Jinja2 on Jython.
--HG--
branch : trunk
Armin Ronacher [Mon, 14 Sep 2009 19:20:33 +0000 (12:20 -0700)]
Made the lru cache more robust.
--HG--
branch : trunk
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
Armin Ronacher [Sun, 13 Sep 2009 17:54:37 +0000 (10:54 -0700)]
Clarified copyrights.
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 17:35:54 +0000 (10:35 -0700)]
Fixed the install docs.
--HG--
branch : trunk
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
Armin Ronacher [Sun, 13 Sep 2009 07:46:59 +0000 (00:46 -0700)]
Improved wording in the CHANGES file.
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 07:30:13 +0000 (00:30 -0700)]
Added tag 2.2 for changeset
f20ea8e724a0
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 07:30:06 +0000 (00:30 -0700)]
Disabled speedups by default.
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 07:25:11 +0000 (00:25 -0700)]
Added tag 2.2 for changeset
41c2aca50afd
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 07:23:57 +0000 (00:23 -0700)]
Updated changes.
--HG--
branch : trunk
Armin Ronacher [Sun, 13 Sep 2009 07:23:27 +0000 (00:23 -0700)]
(codename Kong, released on September 12th 2009)
--HG--
branch : trunk
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
Armin Ronacher [Sun, 13 Sep 2009 06:48:18 +0000 (23:48 -0700)]
Added ugly workaround for a loop bug.
--HG--
branch : trunk
Armin Ronacher [Thu, 10 Sep 2009 20:58:52 +0000 (13:58 -0700)]
Added tornado templates to benchmark.
--HG--
branch : trunk
Armin Ronacher [Wed, 5 Aug 2009 18:25:06 +0000 (20:25 +0200)]
More Python 3 support.
--HG--
branch : trunk
Armin Ronacher [Wed, 5 Aug 2009 16:45:39 +0000 (18:45 +0200)]
Started to work on Python 3 support.
--HG--
branch : trunk
Armin Ronacher [Wed, 5 Aug 2009 16:07:13 +0000 (18:07 +0200)]
Unicode support for wordcount.
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 09:48:41 +0000 (11:48 +0200)]
Added unittests for meta.
--HG--
branch : trunk
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
Armin Ronacher [Sun, 26 Jul 2009 09:08:57 +0000 (11:08 +0200)]
fab -> make
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 09:08:50 +0000 (11:08 +0200)]
Got rid of py.testisms.
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)]
merged.
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 08:35:04 +0000 (10:35 +0200)]
merged.
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 08:34:18 +0000 (10:34 +0200)]
Added missing module.
--HG--
branch : trunk
Armin Ronacher [Sun, 26 Jul 2009 08:33:36 +0000 (10:33 +0200)]
Added the `meta` module.
--HG--
branch : trunk
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
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
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
Armin Ronacher [Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)]
Merged
--HG--
branch : trunk
Christopher Denter [Sun, 3 May 2009 10:57:08 +0000 (12:57 +0200)]
typo fix
--HG--
branch : trunk
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
Armin Ronacher [Sat, 2 May 2009 12:22:32 +0000 (14:22 +0200)]
Fixed typo.
--HG--
branch : trunk
Armin Ronacher [Tue, 28 Apr 2009 00:05:14 +0000 (02:05 +0200)]
Improved changelog rendering
--HG--
branch : trunk
Christopher Denter [Mon, 27 Apr 2009 23:50:32 +0000 (01:50 +0200)]
Fix typo. Closes #343
--HG--
branch : trunk
Rene Leonhardt [Mon, 20 Apr 2009 21:08:53 +0000 (23:08 +0200)]
Support nose framework for the whole test suite.
--HG--
branch : trunk
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
Armin Ronacher [Thu, 16 Apr 2009 22:10:48 +0000 (00:10 +0200)]
Removed print statement left in the code
--HG--
branch : trunk
Armin Ronacher [Thu, 16 Apr 2009 21:17:43 +0000 (23:17 +0200)]
Resolved conflict
--HG--
branch : trunk
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
Armin Ronacher [Thu, 2 Apr 2009 12:04:41 +0000 (14:04 +0200)]
Documented more changes
--HG--
branch : trunk
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
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
Armin Ronacher [Thu, 2 Apr 2009 12:14:30 +0000 (14:14 +0200)]
Broken overlong line.
--HG--
branch : trunk
Armin Ronacher [Wed, 1 Apr 2009 17:17:31 +0000 (19:17 +0200)]
Added a testcase for the last change.
--HG--
branch : trunk
Armin Ronacher [Wed, 1 Apr 2009 17:16:25 +0000 (19:16 +0200)]
Fixed another bug with line comments
--HG--
branch : trunk
Armin Ronacher [Tue, 31 Mar 2009 21:51:56 +0000 (23:51 +0200)]
Fixed bug in line-based comments with priority.
--HG--
branch : trunk
Armin Ronacher [Mon, 30 Mar 2009 19:00:16 +0000 (21:00 +0200)]
Added support for line-based comments.
--HG--
branch : trunk
Armin Ronacher [Mon, 30 Mar 2009 16:50:49 +0000 (18:50 +0200)]
Added testcase for #335
--HG--
branch : trunk
Armin Ronacher [Wed, 18 Mar 2009 00:01:36 +0000 (01:01 +0100)]
Applied documentation patches by Clemens Hermann.
--HG--
branch : trunk
Armin Ronacher [Tue, 17 Mar 2009 23:59:32 +0000 (00:59 +0100)]
Added testcase for a bug
--HG--
branch : trunk
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
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
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
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
Armin Ronacher [Thu, 19 Feb 2009 15:11:11 +0000 (16:11 +0100)]
Added proper super() support for scoped blocks.
--HG--
branch : trunk
Armin Ronacher [Thu, 19 Feb 2009 14:56:53 +0000 (15:56 +0100)]
Added support for optional `scoped` modifier to blocks.
--HG--
branch : trunk
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
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
Armin Ronacher [Sun, 8 Feb 2009 10:11:57 +0000 (11:11 +0100)]
Fixed a documenation bug in the cache extension.
--HG--
branch : trunk
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
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
Armin Ronacher [Wed, 4 Feb 2009 18:13:58 +0000 (19:13 +0100)]
Fixed a bug that caused syntax errors when defining macros or using the
`{% call %}` tag inside loops.
This fixes #323.
--HG--
branch : trunk
Armin Ronacher [Wed, 4 Feb 2009 18:03:40 +0000 (19:03 +0100)]
This fixes #325.
--HG--
branch : trunk
Armin Ronacher [Wed, 4 Feb 2009 18:02:30 +0000 (19:02 +0100)]
This fixes #317.
--HG--
branch : trunk
Armin Ronacher [Wed, 4 Feb 2009 17:57:27 +0000 (18:57 +0100)]
Priority of `not` raised. It's now possible to write `not foo in bar`
as an alias to `foo not in bar` like in python. Previously the grammar
required parentheses (`not (foo in bar)`) which was odd.
--HG--
branch : trunk
Armin Ronacher [Mon, 12 Jan 2009 10:08:26 +0000 (11:08 +0100)]
Fixed a threading issue with the LRUCache. Still not sure if I should release a Jinja 2.1.2 for that.
--HG--
branch : trunk
Armin Ronacher [Tue, 6 Jan 2009 12:10:58 +0000 (13:10 +0100)]
Fixed inconsistency in LICENSE file.
--HG--
branch : trunk
Armin Ronacher [Mon, 5 Jan 2009 11:16:46 +0000 (12:16 +0100)]
Same thing for extensions.
--HG--
branch : trunk
Ali Afshar [Mon, 5 Jan 2009 11:14:14 +0000 (12:14 +0100)]
This commit makes the parser and lexer use regular string comparison to support jython
--HG--
branch : trunk
Armin Ronacher [Sun, 4 Jan 2009 13:26:19 +0000 (14:26 +0100)]
Copyright switch to "The Jinja Team".
--HG--
branch : trunk
Armin Ronacher [Sat, 27 Dec 2008 12:10:38 +0000 (13:10 +0100)]
Include statements can now be marked with ``ignore missing`` to skip
non existing templates.
--HG--
branch : trunk
Armin Ronacher [Thu, 25 Dec 2008 17:51:22 +0000 (18:51 +0100)]
Tip is 2.2
--HG--
branch : trunk
Armin Ronacher [Thu, 25 Dec 2008 17:40:47 +0000 (18:40 +0100)]
Added tag 2.1.1 for changeset
744e087d24e9
--HG--
branch : trunk
Armin Ronacher [Thu, 25 Dec 2008 17:40:27 +0000 (18:40 +0100)]
On our way to 2.2 we found a bug in 2.1 and our repo is now 2.1.1 :) No need to branch for that.
--HG--
branch : trunk
Armin Ronacher [Thu, 25 Dec 2008 17:33:46 +0000 (18:33 +0100)]
Fixed a translation error caused by looping over empty recursive loops.
--HG--
branch : trunk
Armin Ronacher [Mon, 8 Dec 2008 14:21:26 +0000 (15:21 +0100)]
Fixed a typo
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 14:45:13 +0000 (15:45 +0100)]
tip is now 2.2-dev
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 12:26:31 +0000 (13:26 +0100)]
Added tag 2.1 for changeset
dbf1e3a0b178
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 12:25:51 +0000 (13:25 +0100)]
Updated documentation to reflect the new speedups installation behavior.
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 12:09:18 +0000 (13:09 +0100)]
Removed optional speedups extension hack.
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 11:56:13 +0000 (12:56 +0100)]
Untagged 2.1
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 11:55:31 +0000 (12:55 +0100)]
Added tag 2.1 for changeset
1322ed9fffbe
--HG--
branch : trunk
Armin Ronacher [Sun, 23 Nov 2008 11:55:23 +0000 (12:55 +0100)]
Final changes for Jinja 2.1 release
--HG--
branch : trunk
Armin Ronacher [Sun, 16 Nov 2008 23:50:09 +0000 (00:50 +0100)]
Added thanks entry for habbie
--HG--
branch : trunk
Armin Ronacher [Sun, 16 Nov 2008 23:35:30 +0000 (00:35 +0100)]
Fixed an escaping bug in urlize
--HG--
branch : trunk
Armin Ronacher [Sun, 2 Nov 2008 14:58:14 +0000 (15:58 +0100)]
Added support for `Environment.compile_expression`.
--HG--
branch : trunk