jinja2.git
11 years agoRun `./2to3.py -w jinja2` master python3
W. Trevor King [Tue, 11 Dec 2012 16:23:40 +0000 (11:23 -0500)]
Run `./2to3.py -w jinja2`

11 years agoAdd 2to3.py script to run both the default and our custom fixes locally
W. Trevor King [Tue, 11 Dec 2012 16:18:29 +0000 (11:18 -0500)]
Add 2to3.py script to run both the default and our custom fixes locally

If you're using the local directory directly, rather than building and
installing Jinja2 via setup.py, you need to make the 2to3 updates
locally, using both the default fixers and our custom fixers.
Unfortunately, the stock 2to3 tool lacks an option for appending
custom fixer modules.  This script is the simplest tweak that will
apply both sets of fixers.

11 years agoFixed an unicode error after 2to3
Armin Ronacher [Sat, 15 Sep 2012 23:30:50 +0000 (08:30 +0900)]
Fixed an unicode error after 2to3

11 years agoAdded filesize part to the module compiler. This fixes #131 for 3.3 and later
Armin Ronacher [Sat, 15 Sep 2012 23:26:31 +0000 (08:26 +0900)]
Added filesize part to the module compiler.  This fixes #131 for 3.3 and later

11 years agoMerge pull request #137 from PaulMcMillan/improve_whitespace_docs
Armin Ronacher [Thu, 5 Jul 2012 07:39:32 +0000 (00:39 -0700)]
Merge pull request #137 from PaulMcMillan/improve_whitespace_docs

Improve whitespace docs to reflect reality.

11 years agoImprove whitespace docs to reflect reality.
Paul McMillan [Wed, 4 Jul 2012 18:57:37 +0000 (11:57 -0700)]
Improve whitespace docs to reflect reality.

See also:
https://groups.google.com/d/msg/pocoo-libs/6DylMqq1voI/GXTbZJ1Tr-sJ

12 years agoFix typos.
Christoph Zwerschke [Sun, 23 Oct 2011 16:23:58 +0000 (18:23 +0200)]
Fix typos.

12 years agoMerge pull request #103 from njl/fix-issue-93
Ron DuPlain [Tue, 13 Mar 2012 23:50:27 +0000 (16:50 -0700)]
Merge pull request #103 from njl/fix-issue-93

Fix to #93, this time respecting whitespace

12 years agoDistinguish ext folder from ext namespace.
Ron DuPlain [Tue, 13 Mar 2012 21:53:15 +0000 (14:53 -0700)]
Distinguish ext folder from ext namespace.

12 years agoFix to #93, this time respecting whitespace
Ned Jackson Lovely [Tue, 13 Mar 2012 00:38:06 +0000 (20:38 -0400)]
Fix to #93, this time respecting whitespace

Rejigger of title split to respect whitespace, also capitalize follow-on
hyphenated words.

12 years agoMerge pull request #78 from SimonSapin/patch-2
Ron DuPlain [Fri, 9 Mar 2012 22:29:09 +0000 (14:29 -0800)]
Merge pull request #78 from SimonSapin/patch-2

Typo fix

12 years agoMerge pull request #81 from obeattie/docs-fix
Ron DuPlain [Fri, 9 Mar 2012 22:26:26 +0000 (14:26 -0800)]
Merge pull request #81 from obeattie/docs-fix

Small typo fix to extension docs

12 years agoMerge pull request #95 from florentx/patch-2
Ron DuPlain [Fri, 9 Mar 2012 22:23:22 +0000 (14:23 -0800)]
Merge pull request #95 from florentx/patch-2

Few typos in jinja2.utils

12 years agoFew typos in jinja2.utils
Florent Xicluna [Sun, 5 Feb 2012 12:09:15 +0000 (13:09 +0100)]
Few typos in jinja2.utils

12 years agoAdded changelog entry for #92 and changed LoopContext.End to _last_iteration
Armin Ronacher [Tue, 24 Jan 2012 23:42:54 +0000 (00:42 +0100)]
Added changelog entry for #92 and changed LoopContext.End to _last_iteration

12 years agoMerge pull request #92 from jasonkotenko/master
Armin Ronacher [Tue, 24 Jan 2012 23:40:38 +0000 (15:40 -0800)]
Merge pull request #92 from jasonkotenko/master

Fix loop.last memory issue

12 years agoFixed loop.last to not consume the entire iterator to determine if this is
Jason Kotenko [Tue, 24 Jan 2012 22:19:08 +0000 (14:19 -0800)]
Fixed loop.last to not consume the entire iterator to determine if this is
the last iteration of the loop.

12 years agoRenamed urlescape to urlencode
Armin Ronacher [Sat, 7 Jan 2012 16:47:56 +0000 (17:47 +0100)]
Renamed urlescape to urlencode

12 years agoReworked implementation of the urlescape filter, made it Python3 compatible, document...
Armin Ronacher [Sat, 7 Jan 2012 16:46:40 +0000 (17:46 +0100)]
Reworked implementation of the urlescape filter, made it Python3 compatible, documented it.

12 years agoNormalize to styleguide
Armin Ronacher [Sat, 7 Jan 2012 16:28:28 +0000 (17:28 +0100)]
Normalize to styleguide

12 years agolive up to @mitsuhiko's ridiculous expectations
Aaron Swartz [Sat, 7 Jan 2012 01:25:57 +0000 (20:25 -0500)]
live up to @mitsuhiko's ridiculous expectations

12 years agoAdd urlescape to default filters.
Aaron Swartz [Fri, 6 Jan 2012 15:27:36 +0000 (10:27 -0500)]
Add urlescape to default filters.

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoFixed a bug in the i18n extraction option handling and added a silent option.
Armin Ronacher [Thu, 15 Dec 2011 10:50:27 +0000 (11:50 +0100)]
Fixed a bug in the i18n extraction option handling and added a silent option.

12 years agoSmall typo fix to extension docs
Oliver Beattie [Thu, 15 Dec 2011 09:47:34 +0000 (09:47 +0000)]
Small typo fix to extension docs

12 years agoMerge pull request #80 from joshmoore/master
Armin Ronacher [Wed, 14 Dec 2011 16:17:27 +0000 (08:17 -0800)]
Merge pull request #80 from joshmoore/master

Minor typo fix under docs/

12 years agoMinor type: s/of/or/
jmoore [Wed, 14 Dec 2011 16:09:29 +0000 (17:09 +0100)]
Minor type: s/of/or/

12 years agoTypo fix
Simon Sapin [Sat, 3 Dec 2011 12:05:08 +0000 (13:05 +0100)]
Typo fix

12 years agoFixed do_filesizeformat to actually calculate correctly, fixes #59
Christopher Grebs [Fri, 7 Oct 2011 20:50:13 +0000 (22:50 +0200)]
Fixed do_filesizeformat to actually calculate correctly, fixes #59

12 years agoAdded a dict iteration example. This fixes #64
Armin Ronacher [Thu, 6 Oct 2011 14:09:31 +0000 (10:09 -0400)]
Added a dict iteration example.  This fixes #64

12 years agoFixed filesizeformat
Armin Ronacher [Wed, 5 Oct 2011 07:48:05 +0000 (09:48 +0200)]
Fixed filesizeformat

12 years agoAdded readme
Armin Ronacher [Mon, 3 Oct 2011 01:05:52 +0000 (03:05 +0200)]
Added readme

12 years agoRemoved tmbundle. Now in mitsuhiko/jinja2-textmate
Armin Ronacher [Mon, 3 Oct 2011 01:05:23 +0000 (03:05 +0200)]
Removed tmbundle.  Now in mitsuhiko/jinja2-textmate

12 years agounused code
Dmitry Jemerov [Mon, 26 Sep 2011 17:06:05 +0000 (19:06 +0200)]
unused code

12 years agofix matching typo in tests, restore missing assert
Dmitry Jemerov [Mon, 26 Sep 2011 17:05:46 +0000 (19:05 +0200)]
fix matching typo in tests, restore missing assert

12 years agofix typo in test name
Dmitry Jemerov [Mon, 26 Sep 2011 17:05:16 +0000 (19:05 +0200)]
fix typo in test name

12 years agocouple of typos in comments
Dmitry Jemerov [Mon, 26 Sep 2011 17:04:29 +0000 (19:04 +0200)]
couple of typos in comments

12 years agoFixed a typo.
Armin Ronacher [Mon, 26 Sep 2011 15:22:22 +0000 (17:22 +0200)]
Fixed a typo.

12 years agoAdded add_extension method to the public API
Armin Ronacher [Sun, 25 Sep 2011 22:41:25 +0000 (00:41 +0200)]
Added add_extension method to the public API

12 years agoAdded GAE debugging snippet
Armin Ronacher [Sun, 25 Sep 2011 12:30:12 +0000 (14:30 +0200)]
Added GAE debugging snippet

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoImproved choice and prefix loaders.
Armin Ronacher [Tue, 13 Sep 2011 21:27:41 +0000 (23:27 +0200)]
Improved choice and prefix loaders.

Choice and prefix loaders now dispatch source and template lookup
separately in order to work in combination with module loaders as
advertised.

12 years agoMerge pull request #51 from kschuetz/master
Armin Ronacher [Tue, 26 Jul 2011 19:36:42 +0000 (12:36 -0700)]
Merge pull request #51 from kschuetz/master

Typo fixes in documentation

12 years agoadded comma
Kevin Schuetz [Tue, 26 Jul 2011 19:21:52 +0000 (14:21 -0500)]
added comma

12 years agorecieves->receives
Kevin Schuetz [Tue, 26 Jul 2011 19:17:38 +0000 (14:17 -0500)]
recieves->receives

12 years agocalld->called
Kevin Schuetz [Tue, 26 Jul 2011 19:16:46 +0000 (14:16 -0500)]
calld->called

12 years agoeached->reached
Kevin Schuetz [Tue, 26 Jul 2011 19:12:21 +0000 (14:12 -0500)]
eached->reached

12 years agoMerge pull request #50 from SimonSapin/patch-1
Armin Ronacher [Mon, 25 Jul 2011 10:09:47 +0000 (03:09 -0700)]
Merge pull request #50 from SimonSapin/patch-1

Typo fix ... I think.

12 years agoTypo fix ... I think.
Simon Sapin [Mon, 25 Jul 2011 07:25:58 +0000 (00:25 -0700)]
Typo fix ... I think.

12 years agomaster is 2.7-dev
Armin Ronacher [Sun, 24 Jul 2011 19:49:07 +0000 (21:49 +0200)]
master is 2.7-dev

12 years agoAdded release script 2.6
Armin Ronacher [Sun, 24 Jul 2011 19:48:29 +0000 (21:48 +0200)]
Added release script

12 years agoversion is now static
Armin Ronacher [Sun, 24 Jul 2011 19:46:23 +0000 (21:46 +0200)]
version is now static

12 years agoPrepairing for a 2.6 release
Armin Ronacher [Sun, 24 Jul 2011 19:46:07 +0000 (21:46 +0200)]
Prepairing for a 2.6 release

12 years agoMerge pull request #48 from ymirpl/master
Armin Ronacher [Tue, 12 Jul 2011 12:02:23 +0000 (05:02 -0700)]
Merge pull request #48 from ymirpl/master

"NameError: global name 'code' is not defined" if using byte code cache on Python 2.7.1.

12 years agoFixed a bug causing "NameError: global name 'code' is not defined".
Marcin Mincer [Tue, 12 Jul 2011 08:59:54 +0000 (01:59 -0700)]
Fixed a bug causing "NameError: global name 'code' is not defined".

12 years agoMerge pull request #47 from mineo/patch-1
Armin Ronacher [Thu, 7 Jul 2011 19:10:31 +0000 (12:10 -0700)]
Merge pull request #47 from mineo/patch-1

Fix a typo

12 years agoFix a typo
Wieland Hoffmann [Thu, 7 Jul 2011 19:09:21 +0000 (12:09 -0700)]
Fix a typo

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoFixed a broken example. This fies #45
Armin Ronacher [Thu, 7 Jul 2011 13:42:25 +0000 (15:42 +0200)]
Fixed a broken example.  This fies #45

12 years agoMerge pull request #43 from jfinkels/patch-1
Armin Ronacher [Tue, 5 Jul 2011 16:25:39 +0000 (09:25 -0700)]
Merge pull request #43 from jfinkels/patch-1

fixed typo in documentation: "environmentfilter" -> "evalcontextfilter"

12 years agofixed typo in documentation: "environmentfilter" -> "evalcontextfilter"
Jeffrey Finkelstein [Fri, 1 Jul 2011 22:46:54 +0000 (15:46 -0700)]
fixed typo in documentation: "environmentfilter" -> "evalcontextfilter"

12 years agoMerge pull request #41 from andymckay/master
Armin Ronacher [Thu, 30 Jun 2011 21:42:01 +0000 (14:42 -0700)]
Merge pull request #41 from andymckay/master

typo?

12 years agofix typo
Andy McKay [Thu, 30 Jun 2011 21:40:05 +0000 (14:40 -0700)]
fix typo

12 years agoMerge pull request #39 from failberg/master
Armin Ronacher [Fri, 17 Jun 2011 02:13:38 +0000 (19:13 -0700)]
Merge pull request #39 from failberg/master

Bugfix for list_templates in PackageLoader

12 years agoFixed groupby bare integer. This fixes #40
Armin Ronacher [Fri, 17 Jun 2011 02:13:00 +0000 (04:13 +0200)]
Fixed groupby bare integer.  This fixes #40

12 years agoFix list_modules for PackageLoader
Bryan Berg [Tue, 14 Jun 2011 01:43:11 +0000 (18:43 -0700)]
Fix list_modules for PackageLoader

12 years agoMerge pull request #33 from razamatan/master
Armin Ronacher [Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)]
Merge pull request #33 from razamatan/master

jinja.vim subsumes htmljinja.vim

12 years agoVarious tweaks to support bccache on Python 3. This fixes #34
Armin Ronacher [Tue, 24 May 2011 15:50:08 +0000 (17:50 +0200)]
Various tweaks to support bccache on Python 3.  This fixes #34

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoAdded test for mappings. This fixes #35
Armin Ronacher [Tue, 24 May 2011 14:40:23 +0000 (16:40 +0200)]
Added test for mappings.  This fixes #35

12 years agoMore extensions in jinja debug
Armin Ronacher [Tue, 24 May 2011 14:40:09 +0000 (16:40 +0200)]
More extensions in jinja debug

12 years agoMerge pull request #37 from fabiant7t/patch-1
Armin Ronacher [Tue, 24 May 2011 14:33:06 +0000 (07:33 -0700)]
Merge pull request #37 from fabiant7t/patch-1

Fixed example of a division with a truncated integer result

12 years agoFixed example of a division with a truncated integer result (it's // instead of /)
Fabian Topfstedt [Sun, 22 May 2011 15:19:12 +0000 (08:19 -0700)]
Fixed example of a division with a truncated integer result (it's // instead of /)

12 years agoMerge pull request #36 from afandian/patch-1
Armin Ronacher [Thu, 19 May 2011 12:01:53 +0000 (05:01 -0700)]
Merge pull request #36 from afandian/patch-1

Kampala is the capital of Uganda!

12 years agoKampala is the capital of Uganda! Jinja's significant, but not the capital...
Joe Wass [Thu, 19 May 2011 10:58:05 +0000 (03:58 -0700)]
Kampala is the capital of Uganda! Jinja's significant, but not the capital...

12 years agojinja.vim subsumes htmljinja.vim
Jin Yi [Fri, 13 May 2011 23:04:20 +0000 (16:04 -0700)]
jinja.vim subsumes htmljinja.vim

12 years agoMerge pull request #30 from sevas/wordwrap-newline
Armin Ronacher [Sat, 7 May 2011 22:27:10 +0000 (15:27 -0700)]
Merge pull request #30 from sevas/wordwrap-newline

wordwrap filter should use the newline_sequence defined in current Environment

12 years agoMerge pull request #26 from jek/master
Armin Ronacher [Sat, 7 May 2011 22:26:51 +0000 (15:26 -0700)]
Merge pull request #26 from jek/master

Removes some dead code from self.block lookup path

12 years agoMerge pull request #28 from alanhogan/patch-1
Armin Ronacher [Sat, 7 May 2011 22:26:31 +0000 (15:26 -0700)]
Merge pull request #28 from alanhogan/patch-1

Clarity

12 years agowordwrap filter should use the newline_sequence defined in current Environment object
sevas [Sun, 1 May 2011 21:28:25 +0000 (23:28 +0200)]
wordwrap filter should use the newline_sequence defined in current Environment object

12 years agoClarity
Alan Hogan [Fri, 29 Apr 2011 03:18:55 +0000 (20:18 -0700)]
Clarity

12 years agoRemoved dead code.
jason kirtland [Mon, 25 Apr 2011 18:19:22 +0000 (11:19 -0700)]
Removed dead code.

12 years agojinja.el: replace obsolete mumamo-find-possible-chunk with mumamo-quick-chunk-forward...
Kanak Kshetri [Wed, 20 Apr 2011 11:31:15 +0000 (07:31 -0400)]
jinja.el: replace obsolete mumamo-find-possible-chunk with mumamo-quick-chunk-forward . This allows jinja mode to be used with nxhtml mode versions later than 2.07.

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
13 years agoCatch down errors caused by tb_set_next. This fixes #22
Armin Ronacher [Mon, 18 Apr 2011 14:27:14 +0000 (16:27 +0200)]
Catch down errors caused by tb_set_next.  This fixes #22

13 years agoFixed a test case
Armin Ronacher [Sun, 13 Mar 2011 18:33:27 +0000 (14:33 -0400)]
Fixed a test case

13 years agoFixed filesizeformat filter. It should now conform to the official SI prefixes and...
Alan Plum [Thu, 17 Feb 2011 15:54:58 +0000 (16:54 +0100)]
Fixed filesizeformat filter. It should now conform to the official SI prefixes and use the correct prefixes for sizes greater than base ** 4.

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
13 years agoUse actual release info
Armin Ronacher [Sun, 6 Feb 2011 11:28:29 +0000 (12:28 +0100)]
Use actual release info

13 years agoWith number of course. Jinja2.pdf not Jinja.pdf
Armin Ronacher [Sun, 6 Feb 2011 11:21:18 +0000 (12:21 +0100)]
With number of course. Jinja2.pdf not Jinja.pdf

13 years agoYay. PDF docs for Jinja2
Armin Ronacher [Sun, 6 Feb 2011 11:19:30 +0000 (12:19 +0100)]
Yay. PDF docs for Jinja2

13 years agoAnother reference
Armin Ronacher [Sat, 29 Jan 2011 19:29:00 +0000 (20:29 +0100)]
Another reference

13 years agoReference to compile_templates
Armin Ronacher [Sat, 29 Jan 2011 19:26:14 +0000 (20:26 +0100)]
Reference to compile_templates

13 years agoAdded missing references to docs
Armin Ronacher [Sat, 29 Jan 2011 19:19:58 +0000 (20:19 +0100)]
Added missing references to docs

13 years agoSlightly modified headline style
Armin Ronacher [Mon, 24 Jan 2011 11:49:56 +0000 (12:49 +0100)]
Slightly modified headline style

13 years agoMakefile for uploading and stuff
Armin Ronacher [Mon, 24 Jan 2011 01:04:48 +0000 (02:04 +0100)]
Makefile for uploading and stuff

13 years agoNew documentation style go match Flask and Werkzeug better
Armin Ronacher [Mon, 24 Jan 2011 01:03:57 +0000 (02:03 +0100)]
New documentation style go match Flask and Werkzeug better

13 years agoDamn you Sphinx
Armin Ronacher [Mon, 24 Jan 2011 00:16:00 +0000 (01:16 +0100)]
Damn you Sphinx

13 years agoFixed a bug in the documentation tool
Armin Ronacher [Mon, 24 Jan 2011 00:14:20 +0000 (01:14 +0100)]
Fixed a bug in the documentation tool

13 years agojoin now also accepts parameters
Armin Ronacher [Mon, 24 Jan 2011 00:13:51 +0000 (01:13 +0100)]
join now also accepts parameters

13 years agoImproved documentation for sum
Armin Ronacher [Mon, 24 Jan 2011 00:07:36 +0000 (01:07 +0100)]
Improved documentation for sum

13 years agosort now also accepts an attribute
Armin Ronacher [Mon, 24 Jan 2011 00:05:47 +0000 (01:05 +0100)]
sort now also accepts an attribute