]>
git.ipfire.org Git - thirdparty/jinja.git/log
Armin Ronacher [Sat, 18 May 2013 10:46:35 +0000 (11:46 +0100)]
Make dump() work Python 3.3
Armin Ronacher [Sat, 18 May 2013 10:44:49 +0000 (11:44 +0100)]
file -> open for 3.x support. This fixes #152
Armin Ronacher [Sat, 18 May 2013 10:38:34 +0000 (11:38 +0100)]
Cleanup up some imports
Armin Ronacher [Sat, 18 May 2013 10:37:18 +0000 (03:37 -0700)]
Merge pull request #213 from Lukasa/luk-sprint-branch
Sprint: Misc fixes.
Armin Ronacher [Sat, 18 May 2013 10:36:32 +0000 (11:36 +0100)]
Fixed a check that broke pypy
Armin Ronacher [Sat, 18 May 2013 10:36:26 +0000 (11:36 +0100)]
Added .tox to .gitignore
Armin Ronacher [Sat, 18 May 2013 10:32:21 +0000 (03:32 -0700)]
Merge pull request #212 from DasIch/add-tox
Add tox configuration
Cory Benfield [Sat, 18 May 2013 09:54:29 +0000 (10:54 +0100)]
No need for tuple comparisons.
Cory Benfield [Sat, 18 May 2013 09:53:48 +0000 (10:53 +0100)]
We don't support 2.4 anymore.
Daniel Neuhäuser [Sat, 18 May 2013 10:29:58 +0000 (12:29 +0200)]
Add tox configuration
Armin Ronacher [Sat, 18 May 2013 10:18:57 +0000 (11:18 +0100)]
A bit of cleanup in the environment
Cory Benfield [Sat, 18 May 2013 09:39:12 +0000 (10:39 +0100)]
Add myself.
Cory Benfield [Sat, 18 May 2013 09:35:04 +0000 (10:35 +0100)]
Trash debugsupport.
Thomas Waldmann [Fri, 17 May 2013 23:16:18 +0000 (01:16 +0200)]
setup.py: add "six" library to install_requires
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
Thomas Waldmann [Fri, 17 May 2013 22:47:41 +0000 (00:47 +0200)]
utils: remove some old py compat code
Thomas Waldmann [Fri, 17 May 2013 22:24:05 +0000 (00:24 +0200)]
_markupsafe: remove some py2.4/2.5 compat code
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
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(""))
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
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
Armin Ronacher [Fri, 12 Apr 2013 23:38:27 +0000 (00:38 +0100)]
Pessimistic locking for LRU cache. This fixes #8
Armin Ronacher [Fri, 12 Apr 2013 23:19:27 +0000 (16:19 -0700)]
Merge pull request #187 from jet-sun/patch-1
correct typo
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
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
Tim Vergenz [Thu, 28 Mar 2013 20:41:35 +0000 (13:41 -0700)]
Correct typo in dictsort filter documentation
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>'
Jet Sun [Wed, 20 Feb 2013 23:30:16 +0000 (15:30 -0800)]
correct typo
Sakti Dwi Cahyono [Fri, 15 Feb 2013 07:08:45 +0000 (14:08 +0700)]
fix typo swtich -> switch
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
Armin Ronacher [Sat, 15 Sep 2012 23:30:50 +0000 (08:30 +0900)]
Fixed an unicode error after 2to3
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
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.
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
Christoph Zwerschke [Sun, 23 Oct 2011 16:23:58 +0000 (18:23 +0200)]
Fix typos.
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
Ron DuPlain [Tue, 13 Mar 2012 21:53:15 +0000 (14:53 -0700)]
Distinguish ext folder from ext namespace.
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.
Ron DuPlain [Fri, 9 Mar 2012 22:29:09 +0000 (14:29 -0800)]
Merge pull request #78 from SimonSapin/patch-2
Typo 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
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
Florent Xicluna [Sun, 5 Feb 2012 12:09:15 +0000 (13:09 +0100)]
Few typos in jinja2.utils
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
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
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.
Armin Ronacher [Sat, 7 Jan 2012 16:47:56 +0000 (17:47 +0100)]
Renamed urlescape to urlencode
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.
Armin Ronacher [Sat, 7 Jan 2012 16:28:28 +0000 (17:28 +0100)]
Normalize to styleguide
Aaron Swartz [Sat, 7 Jan 2012 01:25:57 +0000 (20:25 -0500)]
live up to @mitsuhiko's ridiculous expectations
Aaron Swartz [Fri, 6 Jan 2012 15:27:36 +0000 (10:27 -0500)]
Add urlescape to default filters.
Armin Ronacher [Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)]
Merge branch 'master' of github.com:mitsuhiko/jinja2
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.
Oliver Beattie [Thu, 15 Dec 2011 09:47:34 +0000 (09:47 +0000)]
Small typo fix to extension docs
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/
jmoore [Wed, 14 Dec 2011 16:09:29 +0000 (17:09 +0100)]
Minor type: s/of/or/
Simon Sapin [Sat, 3 Dec 2011 12:05:08 +0000 (13:05 +0100)]
Typo fix
Christopher Grebs [Fri, 7 Oct 2011 20:50:13 +0000 (22:50 +0200)]
Fixed do_filesizeformat to actually calculate correctly, fixes #59
Armin Ronacher [Thu, 6 Oct 2011 14:09:31 +0000 (10:09 -0400)]
Added a dict iteration example. This fixes #64
Armin Ronacher [Wed, 5 Oct 2011 07:48:05 +0000 (09:48 +0200)]
Fixed filesizeformat
Armin Ronacher [Mon, 3 Oct 2011 01:05:52 +0000 (03:05 +0200)]
Added readme
Armin Ronacher [Mon, 3 Oct 2011 01:05:23 +0000 (03:05 +0200)]
Removed tmbundle. Now in mitsuhiko/jinja2-textmate
Dmitry Jemerov [Mon, 26 Sep 2011 17:06:05 +0000 (19:06 +0200)]
unused code
Dmitry Jemerov [Mon, 26 Sep 2011 17:05:46 +0000 (19:05 +0200)]
fix matching typo in tests, restore missing assert
Dmitry Jemerov [Mon, 26 Sep 2011 17:05:16 +0000 (19:05 +0200)]
fix typo in test name
Dmitry Jemerov [Mon, 26 Sep 2011 17:04:29 +0000 (19:04 +0200)]
couple of typos in comments
Armin Ronacher [Mon, 26 Sep 2011 15:22:22 +0000 (17:22 +0200)]
Fixed a typo.
Armin Ronacher [Sun, 25 Sep 2011 22:41:25 +0000 (00:41 +0200)]
Added add_extension method to the public API
Armin Ronacher [Sun, 25 Sep 2011 12:30:12 +0000 (14:30 +0200)]
Added GAE debugging snippet
Armin Ronacher [Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2
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.
Armin Ronacher [Tue, 26 Jul 2011 19:36:42 +0000 (12:36 -0700)]
Merge pull request #51 from kschuetz/master
Typo fixes in documentation
Kevin Schuetz [Tue, 26 Jul 2011 19:21:52 +0000 (14:21 -0500)]
added comma
Kevin Schuetz [Tue, 26 Jul 2011 19:17:38 +0000 (14:17 -0500)]
recieves->receives
Kevin Schuetz [Tue, 26 Jul 2011 19:16:46 +0000 (14:16 -0500)]
calld->called
Kevin Schuetz [Tue, 26 Jul 2011 19:12:21 +0000 (14:12 -0500)]
eached->reached
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.
Simon Sapin [Mon, 25 Jul 2011 07:25:58 +0000 (00:25 -0700)]
Typo fix ... I think.
Armin Ronacher [Sun, 24 Jul 2011 19:49:07 +0000 (21:49 +0200)]
master is 2.7-dev
Armin Ronacher [Sun, 24 Jul 2011 19:48:29 +0000 (21:48 +0200)]
Added release script
Armin Ronacher [Sun, 24 Jul 2011 19:46:23 +0000 (21:46 +0200)]
version is now static
Armin Ronacher [Sun, 24 Jul 2011 19:46:07 +0000 (21:46 +0200)]
Prepairing for a 2.6 release
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.
Marcin Mincer [Tue, 12 Jul 2011 08:59:54 +0000 (01:59 -0700)]
Fixed a bug causing "NameError: global name 'code' is not defined".
Armin Ronacher [Thu, 7 Jul 2011 19:10:31 +0000 (12:10 -0700)]
Merge pull request #47 from mineo/patch-1
Fix a typo
Wieland Hoffmann [Thu, 7 Jul 2011 19:09:21 +0000 (12:09 -0700)]
Fix a typo
Armin Ronacher [Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Thu, 7 Jul 2011 13:42:25 +0000 (15:42 +0200)]
Fixed a broken example. This fies #45
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"
Jeffrey Finkelstein [Fri, 1 Jul 2011 22:46:54 +0000 (15:46 -0700)]
fixed typo in documentation: "environmentfilter" -> "evalcontextfilter"
Armin Ronacher [Thu, 30 Jun 2011 21:42:01 +0000 (14:42 -0700)]
Merge pull request #41 from andymckay/master
typo?
Andy McKay [Thu, 30 Jun 2011 21:40:05 +0000 (14:40 -0700)]
fix typo
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
Armin Ronacher [Fri, 17 Jun 2011 02:13:00 +0000 (04:13 +0200)]
Fixed groupby bare integer. This fixes #40
Bryan Berg [Tue, 14 Jun 2011 01:43:11 +0000 (18:43 -0700)]
Fix list_modules for PackageLoader
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
Armin Ronacher [Tue, 24 May 2011 15:50:08 +0000 (17:50 +0200)]
Various tweaks to support bccache on Python 3. This fixes #34
Armin Ronacher [Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)]
Merge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Tue, 24 May 2011 14:40:23 +0000 (16:40 +0200)]
Added test for mappings. This fixes #35
Armin Ronacher [Tue, 24 May 2011 14:40:09 +0000 (16:40 +0200)]
More extensions in jinja debug
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