]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
12 years agoCorrected title filter behavior.
Armin Ronacher [Wed, 7 Aug 2013 11:53:03 +0000 (12:53 +0100)] 
Corrected title filter behavior.

The title filter will now correctly lowercase the non first letter
like the regular Python filter does.

This fixes #251.

12 years agoFixed warnings if Python is run with -3.
Armin Ronacher [Wed, 7 Aug 2013 11:48:37 +0000 (12:48 +0100)] 
Fixed warnings if Python is run with -3.

This also adds proper hashing and comparision support to
undefined objects.

This fixes #224

12 years agoAdded changelog note
Armin Ronacher [Wed, 7 Aug 2013 11:41:56 +0000 (12:41 +0100)] 
Added changelog note

12 years agoRevert "Support included blocks override"
Armin Ronacher [Wed, 7 Aug 2013 11:40:59 +0000 (12:40 +0100)] 
Revert "Support included blocks override"

This reverts commit 33aee12a29426987805420a410e13e0470a79cbf.

This fixes #243.

12 years agoAdded changelog entry
Armin Ronacher [Wed, 7 Aug 2013 11:31:07 +0000 (12:31 +0100)] 
Added changelog entry

12 years agoFix Python 3 compatibility of BytecodeCache by checking for `if
Marc Abramowitz [Thu, 6 Jun 2013 05:40:03 +0000 (22:40 -0700)] 
Fix Python 3 compatibility of BytecodeCache by checking for `if
isinstance(filename, text_type)` instead of `if isinstance(filename,
unicode)`

12 years agoAdd test (jinja2.testsuite.bytecode_cache.ByteCodeCacheTestCase) for
Marc Abramowitz [Thu, 6 Jun 2013 05:29:04 +0000 (22:29 -0700)] 
Add test (jinja2.testsuite.bytecode_cache.ByteCodeCacheTestCase) for
BytecodeCache that fails on Python 3 because it uses `unicode`

12 years agoFixed a bug with call_filter not working properly
Armin Ronacher [Thu, 4 Jul 2013 14:25:04 +0000 (16:25 +0200)] 
Fixed a bug with call_filter not working properly

12 years agoStarted 2.7 maintenance branch
Armin Ronacher [Thu, 4 Jul 2013 14:24:31 +0000 (16:24 +0200)] 
Started 2.7 maintenance branch

12 years agoBump version number to 2.7 2.7
Armin Ronacher [Mon, 20 May 2013 13:02:56 +0000 (14:02 +0100)] 
Bump version number to 2.7

12 years agoFixed a release script and added a release date
Armin Ronacher [Mon, 20 May 2013 13:02:53 +0000 (14:02 +0100)] 
Fixed a release script and added a release date

12 years agoMake travis execute make test instead of setup.py test
Armin Ronacher [Mon, 20 May 2013 11:18:35 +0000 (12:18 +0100)] 
Make travis execute make test instead of setup.py test

12 years agoClarified some text in the intro
Armin Ronacher [Mon, 20 May 2013 11:15:50 +0000 (12:15 +0100)] 
Clarified some text in the intro

12 years agoDisable py_compile for Python 3 and pypy
Armin Ronacher [Mon, 20 May 2013 11:11:02 +0000 (12:11 +0100)] 
Disable py_compile for Python 3 and pypy

12 years agoAdded nicer test finder from Flask
Armin Ronacher [Mon, 20 May 2013 10:51:37 +0000 (11:51 +0100)] 
Added nicer test finder from Flask

12 years agoUpdated makefile with tox and develop command
Armin Ronacher [Mon, 20 May 2013 10:44:15 +0000 (11:44 +0100)] 
Updated makefile with tox and develop command

12 years agoActually remove argument in setup.py for speedups
Armin Ronacher [Mon, 20 May 2013 08:49:40 +0000 (09:49 +0100)] 
Actually remove argument in setup.py for speedups

12 years agoDocumented loop.depth and added loop.depth0.
Armin Ronacher [Mon, 20 May 2013 08:26:57 +0000 (09:26 +0100)] 
Documented loop.depth and added loop.depth0.

12 years agoChanged lookup logic for make_attrgetter to support integers like the regular syntax
Armin Ronacher [Mon, 20 May 2013 08:07:08 +0000 (09:07 +0100)] 
Changed lookup logic for make_attrgetter to support integers like the regular syntax

12 years agoRenamed helper classes in with_metaclass
Armin Ronacher [Mon, 20 May 2013 08:00:04 +0000 (09:00 +0100)] 
Renamed helper classes in with_metaclass

12 years agoAdded missing method for template errors
Armin Ronacher [Mon, 20 May 2013 01:21:17 +0000 (02:21 +0100)] 
Added missing method for template errors

12 years agoRemoved some dead imports
Armin Ronacher [Mon, 20 May 2013 01:19:35 +0000 (02:19 +0100)] 
Removed some dead imports

12 years agoUnified constructor for template errors between 2.x and 3.x
Armin Ronacher [Mon, 20 May 2013 01:18:47 +0000 (02:18 +0100)] 
Unified constructor for template errors between 2.x and 3.x

12 years agofeature to version check for context dict methods
Armin Ronacher [Mon, 20 May 2013 01:15:04 +0000 (02:15 +0100)] 
feature to version check for context dict methods

12 years agoCorrected a newline
Armin Ronacher [Mon, 20 May 2013 01:13:15 +0000 (02:13 +0100)] 
Corrected a newline

12 years agoRemoved an unnecessary check
Armin Ronacher [Mon, 20 May 2013 01:12:34 +0000 (02:12 +0100)] 
Removed an unnecessary check

12 years agoMore cleanup in the utils module
Armin Ronacher [Mon, 20 May 2013 01:11:16 +0000 (02:11 +0100)] 
More cleanup in the utils module

12 years agoSome more small cleanup for metaclasses
Armin Ronacher [Mon, 20 May 2013 01:05:48 +0000 (02:05 +0100)] 
Some more small cleanup for metaclasses

12 years agoDisable module loader test case on pypy because they are not supported
Armin Ronacher [Mon, 20 May 2013 01:00:02 +0000 (02:00 +0100)] 
Disable module loader test case on pypy because they are not supported

12 years agoAdded an explanation for how with_metaclass works
Armin Ronacher [Mon, 20 May 2013 00:53:10 +0000 (01:53 +0100)] 
Added an explanation for how with_metaclass works

12 years agoMake the runtime leak less of the version hacks
Armin Ronacher [Mon, 20 May 2013 00:51:26 +0000 (01:51 +0100)] 
Make the runtime leak less of the version hacks

12 years agoAdded .egg to .gitignore
Armin Ronacher [Mon, 20 May 2013 00:32:44 +0000 (01:32 +0100)] 
Added .egg to .gitignore

12 years agoRemoved unnecessary del
Armin Ronacher [Sun, 19 May 2013 13:46:12 +0000 (14:46 +0100)] 
Removed unnecessary del

12 years agoAdded unicode mixin for unified string logic
Armin Ronacher [Sun, 19 May 2013 13:43:18 +0000 (14:43 +0100)] 
Added unicode mixin for unified string logic

12 years agoPY3 -> PY2 macro
Armin Ronacher [Sun, 19 May 2013 13:34:54 +0000 (14:34 +0100)] 
PY3 -> PY2 macro

12 years agoRewrapped import
Armin Ronacher [Sun, 19 May 2013 13:23:30 +0000 (14:23 +0100)] 
Rewrapped import

12 years agoUnified version checks where appropriate
Armin Ronacher [Sun, 19 May 2013 13:22:08 +0000 (14:22 +0100)] 
Unified version checks where appropriate

12 years agoMoved all six usages (ignoring testsuite) into jinja2._compat
Armin Ronacher [Sun, 19 May 2013 13:16:13 +0000 (14:16 +0100)] 
Moved all six usages (ignoring testsuite) into jinja2._compat

12 years agoRemoved mention of speedup module and rewrote docs for markupsafe dependency
Armin Ronacher [Sun, 19 May 2013 12:51:47 +0000 (13:51 +0100)] 
Removed mention of speedup module and rewrote docs for markupsafe dependency

12 years agoRemoved bundled markupsafe
Armin Ronacher [Sun, 19 May 2013 12:49:12 +0000 (13:49 +0100)] 
Removed bundled markupsafe

12 years agoFixed a docstring and a syntax error on 3.3
Armin Ronacher [Sun, 19 May 2013 12:47:33 +0000 (13:47 +0100)] 
Fixed a docstring and a syntax error on 3.3

12 years agosix.advance_iterator -> next
Armin Ronacher [Sun, 19 May 2013 12:46:22 +0000 (13:46 +0100)] 
six.advance_iterator -> next

12 years agoMerge remote-tracking branch 'paradoxxxzero/include_fix'
Armin Ronacher [Sun, 19 May 2013 12:25:43 +0000 (13:25 +0100)] 
Merge remote-tracking branch 'paradoxxxzero/include_fix'

12 years agoFixed #79
Armin Ronacher [Sun, 19 May 2013 12:23:57 +0000 (13:23 +0100)] 
Fixed #79

12 years agoMerge remote-tracking branch 'apollo13/master'
Armin Ronacher [Sun, 19 May 2013 11:45:48 +0000 (12:45 +0100)] 
Merge remote-tracking branch 'apollo13/master'

12 years agoFixed a loop bug. This fixes #100
Armin Ronacher [Sun, 19 May 2013 11:44:50 +0000 (12:44 +0100)] 
Fixed a loop bug.  This fixes #100

12 years agoMerge pull request #112 from Cito/master
Armin Ronacher [Sun, 19 May 2013 11:31:48 +0000 (04:31 -0700)] 
Merge pull request #112 from Cito/master

Addition/correction for pull request #69 - add note to docs

12 years agoMerge remote-tracking branch 'Talksum/distribute_required'
Armin Ronacher [Sun, 19 May 2013 11:29:55 +0000 (12:29 +0100)] 
Merge remote-tracking branch 'Talksum/distribute_required'

12 years agoAdded support for map, select, reject, selectattr and rejectattr
Armin Ronacher [Sun, 19 May 2013 11:25:32 +0000 (12:25 +0100)] 
Added support for map, select, reject, selectattr and rejectattr
filters.

This supercedes #66

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Sun, 19 May 2013 10:37:01 +0000 (11:37 +0100)] 
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoWhitespace normalization
Armin Ronacher [Sun, 19 May 2013 10:36:52 +0000 (11:36 +0100)] 
Whitespace normalization

12 years agoMerge pull request #76 from kracekumar/master
Armin Ronacher [Sun, 19 May 2013 10:33:59 +0000 (03:33 -0700)] 
Merge pull request #76 from kracekumar/master

Changed three to four in nodes.py at line no 107

12 years agoFlask -> Jinja2
Armin Ronacher [Sun, 19 May 2013 10:29:55 +0000 (11:29 +0100)] 
Flask -> Jinja2

12 years agoMerge pull request #104 from njl/fix-issue-77
Armin Ronacher [Sun, 19 May 2013 10:29:35 +0000 (03:29 -0700)] 
Merge pull request #104 from njl/fix-issue-77

Fix issue #77

12 years agoMerge pull request #94 from florentx/patch-1
Armin Ronacher [Sun, 19 May 2013 10:29:15 +0000 (03:29 -0700)] 
Merge pull request #94 from florentx/patch-1

Fix the Mako-like environment.

12 years agoMerge pull request #114 from cocoatomo/patch-1
Armin Ronacher [Sun, 19 May 2013 10:26:14 +0000 (03:26 -0700)] 
Merge pull request #114 from cocoatomo/patch-1

There is no need to initialize Environment#bytecode_cache twice

12 years agoMerge pull request #138 from gazpachoking/default_fix
Armin Ronacher [Sun, 19 May 2013 10:25:40 +0000 (03:25 -0700)] 
Merge pull request #138 from gazpachoking/default_fix

Prevent default filter from throwing UndefinedError

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Sun, 19 May 2013 10:18:59 +0000 (11:18 +0100)] 
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoMerge remote-tracking branch 'kristi/master'
Armin Ronacher [Sun, 19 May 2013 10:18:19 +0000 (11:18 +0100)] 
Merge remote-tracking branch 'kristi/master'

12 years agoMerge pull request #149 from dmedvinsky/patch-1
Armin Ronacher [Sun, 19 May 2013 10:11:04 +0000 (03:11 -0700)] 
Merge pull request #149 from dmedvinsky/patch-1

Fix typo in `include` documentation

12 years agoMerge pull request #162 from mgax/fix-caching
Armin Ronacher [Sun, 19 May 2013 10:10:01 +0000 (03:10 -0700)] 
Merge pull request #162 from mgax/fix-caching

fix DictLoader `uptodate` callback

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Sun, 19 May 2013 10:09:44 +0000 (11:09 +0100)] 
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoMerge remote-tracking branch 'wking/keep-trailing-newline'
Armin Ronacher [Sun, 19 May 2013 10:09:19 +0000 (11:09 +0100)] 
Merge remote-tracking branch 'wking/keep-trailing-newline'

12 years agoMerge pull request #165 from AquarHEAD/master
Armin Ronacher [Sun, 19 May 2013 10:07:28 +0000 (03:07 -0700)] 
Merge pull request #165 from AquarHEAD/master

Update the Docstring of do_truncate in jinja2/filters.py

12 years agoMerge pull request #159 from myle/patch-1
Armin Ronacher [Sun, 19 May 2013 10:07:11 +0000 (03:07 -0700)] 
Merge pull request #159 from myle/patch-1

Update docs/templates.rst

12 years agoMerge pull request #141 from dgilman/patch-1
Armin Ronacher [Sun, 19 May 2013 10:06:52 +0000 (03:06 -0700)] 
Merge pull request #141 from dgilman/patch-1

Fix FAQ typo

12 years agoMerge pull request #173 from kracekumar/patch-1
Armin Ronacher [Sun, 19 May 2013 10:06:39 +0000 (03:06 -0700)] 
Merge pull request #173 from kracekumar/patch-1

Update jinja2/filters.py

12 years agoAdded a way to disable memcache error ignoring and documented the change. Also chang...
Armin Ronacher [Sun, 19 May 2013 10:06:18 +0000 (11:06 +0100)] 
Added a way to disable memcache error ignoring and documented the change.  Also changed a bare except to an except on the exception type.

12 years agoMerge remote-tracking branch 'kadams54/master'
Armin Ronacher [Sun, 19 May 2013 10:04:40 +0000 (11:04 +0100)] 
Merge remote-tracking branch 'kadams54/master'

12 years agoMerge pull request #203 from aspiers/master
Armin Ronacher [Sun, 19 May 2013 10:03:50 +0000 (03:03 -0700)] 
Merge pull request #203 from aspiers/master

Prevent line statements eating newlines (fixes #52)

12 years agoMerge pull request #166 from rtorr/patch-1
Armin Ronacher [Sun, 19 May 2013 10:03:06 +0000 (03:03 -0700)] 
Merge pull request #166 from rtorr/patch-1

Update docs/tricks.rst

12 years agoRemoved dummy readme
Armin Ronacher [Sat, 18 May 2013 13:31:47 +0000 (14:31 +0100)] 
Removed dummy readme

12 years agoMerge pull request #222 from mgax/exception-messages
Armin Ronacher [Sat, 18 May 2013 12:58:06 +0000 (05:58 -0700)] 
Merge pull request #222 from mgax/exception-messages

Python 3 exceptions can handle unicode messages

12 years agoRemoved a refrence to removed debugsupport in the manifest
Armin Ronacher [Sat, 18 May 2013 12:45:00 +0000 (13:45 +0100)] 
Removed a refrence to removed debugsupport in the manifest

12 years agoPython 3 exceptions can handle unicode messages 222/head
Alex Morega [Sat, 18 May 2013 12:35:46 +0000 (15:35 +0300)] 
Python 3 exceptions can handle unicode messages

12 years agoxrange -> range_type for consistency
Armin Ronacher [Sat, 18 May 2013 12:05:01 +0000 (13:05 +0100)] 
xrange -> range_type for consistency

12 years agoAdded 3.3
Armin Ronacher [Sat, 18 May 2013 11:58:29 +0000 (12:58 +0100)] 
Added 3.3

12 years agoRemoved 2.5 for travis on the new branch
Armin Ronacher [Sat, 18 May 2013 11:45:13 +0000 (12:45 +0100)] 
Removed 2.5 for travis on the new branch

12 years agoMerge branch 'master' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:44:48 +0000 (12:44 +0100)] 
Merge branch 'master' into sprint-branch

12 years agoFixed MethodType being wrong on 3.x
Armin Ronacher [Sat, 18 May 2013 11:44:03 +0000 (12:44 +0100)] 
Fixed MethodType being wrong on 3.x

12 years agoMerge pull request #219 from sharoonthomas/master
Armin Ronacher [Sat, 18 May 2013 11:41:10 +0000 (04:41 -0700)] 
Merge pull request #219 from sharoonthomas/master

Add Travis CI for master

12 years agoMerge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:27:45 +0000 (12:27 +0100)] 
Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branch

12 years agoAdd Travis CI 219/head
Sharoon Thomas [Sat, 18 May 2013 11:26:10 +0000 (16:56 +0530)] 
Add Travis CI

12 years agoFixed a type in a module name.
Armin Ronacher [Sat, 18 May 2013 11:25:16 +0000 (12:25 +0100)] 
Fixed a type in a module name.

12 years agounit test for dumping as utf-8 to a file 218/head
Alex Morega [Sat, 18 May 2013 11:22:30 +0000 (14:22 +0300)] 
unit test for dumping as utf-8 to a file

12 years agoMerge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:23:30 +0000 (12:23 +0100)] 
Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch

12 years agostuff missing from previous commit, thanks git
Thomas Waldmann [Sat, 18 May 2013 11:14:14 +0000 (13:14 +0200)] 
stuff missing from previous commit, thanks git

12 years agoMerge branch 'master' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:11:05 +0000 (12:11 +0100)] 
Merge branch 'master' into sprint-branch

12 years agoMerge pull request #163 from kuyan/patch-1
Armin Ronacher [Sat, 18 May 2013 11:10:52 +0000 (04:10 -0700)] 
Merge pull request #163 from kuyan/patch-1

Fixed typo

12 years agoMerge pull request #188 from lemonad/master
Armin Ronacher [Sat, 18 May 2013 11:10:40 +0000 (04:10 -0700)] 
Merge pull request #188 from lemonad/master

Fixed typos: overriden to overridden

12 years agonew jinja2._compat module for stuff not yet in six 1.3.0
Thomas Waldmann [Sat, 18 May 2013 11:08:53 +0000 (13:08 +0200)] 
new jinja2._compat module for stuff not yet in six 1.3.0

12 years agoMerge branch 'master' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:07:34 +0000 (12:07 +0100)] 
Merge branch 'master' into sprint-branch

12 years agoAdded missing versionadded and changelog entry
Armin Ronacher [Sat, 18 May 2013 11:07:27 +0000 (12:07 +0100)] 
Added missing versionadded and changelog entry

12 years agoMerge branch 'master' of github.com:mitsuhiko/jinja2
Armin Ronacher [Sat, 18 May 2013 11:06:06 +0000 (12:06 +0100)] 
Merge branch 'master' of github.com:mitsuhiko/jinja2

12 years agoMerge pull request #206 from johnmcdonnell/wordwrap
Armin Ronacher [Sat, 18 May 2013 11:05:57 +0000 (04:05 -0700)] 
Merge pull request #206 from johnmcdonnell/wordwrap

Allow choice of wrap string in wordwrap filter.

12 years agoMerge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:04:23 +0000 (12:04 +0100)] 
Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch

12 years agoMerge branch 'master' into sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:04:19 +0000 (12:04 +0100)] 
Merge branch 'master' into sprint-branch

12 years agoMerge pull request #216 from Lukasa/luk-sprint-branch
Armin Ronacher [Sat, 18 May 2013 11:03:40 +0000 (04:03 -0700)] 
Merge pull request #216 from Lukasa/luk-sprint-branch

Sprint: Not supporting Python 2.4 is a blessing

12 years agoWhitespace cleanup
Armin Ronacher [Sat, 18 May 2013 11:02:11 +0000 (12:02 +0100)] 
Whitespace cleanup

12 years agoPython 2.6+ supports conditional expressions. 216/head
Cory Benfield [Sat, 18 May 2013 10:58:57 +0000 (11:58 +0100)] 
Python 2.6+ supports conditional expressions.