]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
12 years agosetup.py: add "six" library to install_requires 210/head
Thomas Waldmann [Fri, 17 May 2013 23:16:18 +0000 (01:16 +0200)] 
setup.py: add "six" library to install_requires

12 years agoupdate docs / changelog about python requirement, add myself to AUTHORS
Thomas Waldmann [Fri, 17 May 2013 23:07:52 +0000 (01:07 +0200)] 
update docs / changelog about python requirement, add myself to AUTHORS

also added 2 FIXMEs to intro.rst about the debugsupport for python 2.4
that needs to get removed

12 years agoutils: remove some old py compat code
Thomas Waldmann [Fri, 17 May 2013 22:47:41 +0000 (00:47 +0200)] 
utils: remove some old py compat code

12 years ago_markupsafe: remove some py2.4/2.5 compat code
Thomas Waldmann [Fri, 17 May 2013 22:24:05 +0000 (00:24 +0200)] 
_markupsafe: remove some py2.4/2.5 compat code

12 years agopython 3 port: manual fixes, remove 2to3 from setup.py, remove fixers
Thomas Waldmann [Fri, 17 May 2013 22:06:22 +0000 (00:06 +0200)] 
python 3 port: manual fixes, remove 2to3 from setup.py, remove fixers

12 years agopython 3 port: automated changes by a slightly modified python-modernize
Thomas Waldmann [Fri, 17 May 2013 21:52:14 +0000 (23:52 +0200)] 
python 3 port: automated changes by a slightly modified python-modernize

(replacing unicode with six.text_type, but not replacing u"" by six.u(""))

12 years agoMerge pull request #177 from sakti/patch-1
Armin Ronacher [Fri, 12 Apr 2013 23:39:51 +0000 (16:39 -0700)] 
Merge pull request #177 from sakti/patch-1

fix typo swtich -> switch

12 years agoMerge pull request #171 from mgorny/master
Armin Ronacher [Fri, 12 Apr 2013 23:39:34 +0000 (16:39 -0700)] 
Merge pull request #171 from mgorny/master

Fix jinjaext compatibility with Python 3

12 years agoPessimistic locking for LRU cache. This fixes #8
Armin Ronacher [Fri, 12 Apr 2013 23:38:27 +0000 (00:38 +0100)] 
Pessimistic locking for LRU cache.  This fixes #8

12 years agoMerge pull request #187 from jet-sun/patch-1
Armin Ronacher [Fri, 12 Apr 2013 23:19:27 +0000 (16:19 -0700)] 
Merge pull request #187 from jet-sun/patch-1

correct typo

12 years agoMerge pull request #193 from mozillazg/patch-1
Armin Ronacher [Fri, 12 Apr 2013 23:18:49 +0000 (16:18 -0700)] 
Merge pull request #193 from mozillazg/patch-1

Fixed an issue about urlize function

12 years agoMerge pull request #195 from vergenzt/master
Armin Ronacher [Fri, 12 Apr 2013 23:18:03 +0000 (16:18 -0700)] 
Merge pull request #195 from vergenzt/master

Correct typo in dictsort filter documentation

12 years agoCorrect typo in dictsort filter documentation 195/head
Tim Vergenz [Thu, 28 Mar 2013 20:41:35 +0000 (13:41 -0700)] 
Correct typo in dictsort filter documentation

12 years agoFixed an issue about urlize function 193/head
mozillazg [Mon, 18 Mar 2013 06:27:54 +0000 (14:27 +0800)] 
Fixed an issue about urlize function

When URL startswith 'https://', the return is wrong.
Before:

    >>> urlize('https://github.com/')
    u'<a href="http://https://github.com/">https://github.com/</a>'
After:

    >>> urlize('https://github.com/')
    u'<a href="https://github.com/">https://github.com/</a>'

12 years agocorrect typo 187/head
Jet Sun [Wed, 20 Feb 2013 23:30:16 +0000 (15:30 -0800)] 
correct typo

12 years agofix typo swtich -> switch 177/head
Sakti Dwi Cahyono [Fri, 15 Feb 2013 07:08:45 +0000 (14:08 +0700)] 
fix typo swtich -> switch

12 years agoFix jinjaext compatibility with Python 3. 171/head
Michał Górny [Sun, 13 Jan 2013 21:58:30 +0000 (22:58 +0100)] 
Fix jinjaext compatibility with Python 3.

Patch by Arfrever.

Fixes: https://github.com/mitsuhiko/jinja2/issues/115
12 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

12 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

13 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.

13 years agoImprove whitespace docs to reflect reality. 137/head
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

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

13 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

13 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.

13 years agoFix to #93, this time respecting whitespace 103/head
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.

13 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

13 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

13 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

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

13 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

13 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

13 years agoFixed loop.last to not consume the entire iterator to determine if this is 92/head
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.

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

13 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.

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

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

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

13 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

13 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.

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

13 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/

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

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

13 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

13 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

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

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

13 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

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

13 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

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

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

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

13 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

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

13 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

13 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.

14 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

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

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

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

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

14 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.

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

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

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

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

14 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

14 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.

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

14 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

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

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

14 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

14 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"

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

14 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?

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

14 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

14 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

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

14 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

14 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

14 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

14 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

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

14 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

14 years agoFixed example of a division with a truncated integer result (it's // instead of /) 37/head
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 /)

14 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!

14 years agoKampala is the capital of Uganda! Jinja's significant, but not the capital... 36/head
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...

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

14 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

14 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

14 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

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

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

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

14 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>
14 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

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