summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Add test cases for quotes and expand coverage to include Markup inputErik Johnson2018-03-191-6/+17
| | | | | |
| * | | | | Fix cases where filter input is not a Markup typeErik Johnson2018-03-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit assumes that the filter will always be a Markup type, which is not correct.
| * | | | | Fix escaped characters in indent filterErik Johnson2018-03-191-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This unescapes after concatenating, to fix a bug introduced in Jinja 2.10 where lines concatenated contain escaped versions of non-ascii characters.
* | | | | Correct documentation for min method (#825)Sean Sabbage2018-03-191-1/+1
| | | | |
* | | | | Merge pull request #820 from jdufresne/typoDavid Lord2018-03-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo: apparenlty -> apparently.
| * | | | | Fix typo: apparenlty -> apparently.Jon Dufresne2018-03-041-1/+1
|/ / / / /
* | | | | Fix typos (#815)luzpaz2018-02-186-9/+9
| | | | | | | | | | | | | | | Found via `codespell -q 3` using v1.12.0.dev0
* | | | | Merge pull request #806 from methane/lazy-async-patchDavid Lord2018-02-065-15/+15
|\ \ \ \ \ | | | | | | | | | | | | Lazy asyncsupport.patch_all()
| * | | | | add changelogDavid Lord2018-02-062-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | fix unrelated docs issue
| * | | | | Lazy asyncsupport.patch_all()INADA Naoki2018-02-063-11/+5
|/ / / / / | | | | | | | | | | | | | | | fixes #765
* | | | | Remove old statement about Python 3 (#803)Godefroid Chapelle2018-01-301-16/+0
|/ / / / | | | | | | | | There is now Python 3 support...
* | | | Merge pull request #799 from mkrizek/native-concat-listDavid Lord2018-01-232-1/+10
|\ \ \ \ | | | | | | | | | | Allow to pass a list to native_concat
| * | | | Don't check for generator if not neededMartin Krizek2018-01-171-3/+2
| | | | |
| * | | | Allow to pass a list to native_concatMartin Krizek2018-01-172-1/+11
| | | | |
* | | | | fix code block markupDavid Lord2018-01-181-1/+1
|/ / / / | | | | | | | | closes #800
* | | | Merge pull request #787 from SabujXi/patch-1David Lord2017-12-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo instanciable > instantiable
| * | | | Fix typo instanciable > instantiableMd. Sabuj Sarker2017-12-021-1/+1
|/ / / /
* | | | Merge pull request #783 from luzpaz/trivial-typosDavid Lord2017-11-086-11/+11
|\ \ \ \ | | | | | | | | | | Trivial typos
| * | | | Trivial typosUnknown2017-11-086-11/+11
|/ / / / | | | | | | | | Most non-user facing.
* | | | Bump version number to 2.11.devDavid Lord2017-11-083-2/+8
|/ / /
* | | Bump version number to 2.102.102.10-maintenanceDavid Lord2017-11-082-2/+2
| | |
* | | clean up MANIFEST.inDavid Lord2017-11-084-146/+184
| | | | | | | | | | | | | | | | | | clean up make-release.py for py3 add rst extension to CHANGES for GitHub clean up changelog formatting
* | | Support filters in set blockThiefMaster2017-10-316-3/+49
| | | | | | | | | | | | | | | - e.g {% set foo | trim %}...{% endset %} - closes #486
* | | Merge pull request #708 from jctanner/NATIVE_TYPESDavid Lord2017-10-315-1/+399
|\ \ \ | | | | | | | | Add support for the Environment to optionally return native types.
| * \ \ Merge branch 'master' into NATIVE_TYPESDavid Lord2017-10-3113-22/+56
| |\ \ \ | |/ / / |/| | |
* | | | Fix typo in docstring (#779)Ricardo Lafuente2017-10-161-1/+1
| | | |
* | | | codecov needs argparse on 2.6David Lord2017-10-081-0/+2
| | | |
* | | | Minor docstring grammar fix (#772)Eli Boyarski2017-09-181-1/+1
| | | |
* | | | s/Add/Added/ in CHANGESAdrian Moennich2017-08-221-4/+4
| | | | | | | | | | | | | | | | Pretty much all other entries also use past tense
* | | | Merge branch '2.9-maintenance'Adrian Moennich2017-08-227-13/+32
|\ \ \ \ | | |/ / | |/| |
| * | | Compile `elif` tag to `elif` instead of `else: if`2.9-maintenanceAdrian Moennich2017-08-227-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids deep nesting in case of many `{% elif .. %}` blocks (which would fail during execution) and also deep recursion (which may fail during compilation) fixes #759
* | | | Merge branch '2.9-maintenance'Armin Ronacher2017-08-094-4/+17
|\ \ \ \ | |/ / /
| * | | Added a changelog entryArmin Ronacher2017-08-091-0/+2
| | | |
| * | | Fix regression in 2.9 involving unsafe Context.get_all() usageZac Medico2017-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d67f0fd4cc2a4af08f51f4466150d49da7798729, callers of Context.get_all() need to make a copy it they're going to modify the result. Fixes: d67f0fd4cc2a ("Generalize scoping. This fixes #603")
| * | | Merge pull request #718 from ayalash/issue_709David Lord2017-05-233-3/+14
| |\ \ \ | | | | | | | | | | Make tojson always safe (fix #709)
| | * | | add changelogDavid Lord2017-05-231-0/+10
| | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | Make tojson always safe (fix #709)Ayala Shachar2017-05-232-3/+4
| |/ / /
| | * | quickly fix py3 testsJames Tanner2017-07-251-1/+1
| | | |
| | * | Add requested patch for safe_repr and nodes.ImpossibleJames Tanner2017-07-252-1/+19
| | | |
| | * | Merge branch 'master' into NATIVE_TYPESAdrian2017-07-148-58/+227
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #672 from alexk307/tests-memcached-bytecode-cacheDavid Lord2017-07-091-1/+61
|\ \ \ \ | | | | | | | | | | Adds tests for the memcached bytecode cache module
| * | | | rewrite tests to match usageDavid Lord2017-07-091-40/+37
| | | | |
| * | | | Adds tests for the memcached bytecode cache moduleAlex Kahan2017-07-091-1/+64
|/ / / /
* | | | Merge pull request #692 from dnmvisser/dictsort_reverseDavid Lord2017-07-083-16/+25
|\ \ \ \ | | | | | | | | | | Dictsort reverse
| * | | | add test and changelogDavid Lord2017-07-083-14/+20
| | | | | | | | | | | | | | | | | | | | use ignore_case function
| * | | | 'reverse' option for dictsortDick Visser2017-07-081-2/+5
|/ / / /
* | | | Merge pull request #502 from berrange/callableDavid Lord2017-07-071-7/+8
|\ \ \ \ | | | | | | | | | | runtime: avoid assumption that all objects provide __call__
| * | | | runtime: avoid assumption that all objects provide __call__Daniel P. Berrange2015-10-131-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects which are backed by native extensions do not provide a __call__ attribute, but are none the less callable if the native extension provides a 'tp_call' implementation. The jinja2.runtime.Context.call method unconditionally access the '__call__' attribute causing an exception to be raised if the object was a native extension method. A demo of the problem can be seen using PyGObject: $ cat demo.py #!/usr/bin/python from gi.repository import Gio from jinja2 import Environment f = Gio.File.new_for_path("/some/file.txt") print f.get_uri() t = Environment().from_string("""{{f.get_uri()}}""") print t.render(f=f) Which when run results in $ ./demo.py file:///some/file.txt Traceback (most recent call last): File "./demo.py", line 10, in <module> print t.render(f=f) File "/usr/lib/python2.7/site-packages/jinja2/environment.py", line 969, in render return self.environment.handle_exception(exc_info, True) File "/usr/lib/python2.7/site-packages/jinja2/environment.py", line 742, in handle_exception reraise(exc_type, exc_value, tb) File "<template>", line 1, in top-level template code AttributeError: 'gi.FunctionInfo' object has no attribute '__call__' After this patch it produces $ ./demo.py file:///some/file.txt file:///some/file.txt Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | Merge pull request #685 from jkfran/masterDavid Lord2017-07-073-15/+56
|\ \ \ \ \ | | | | | | | | | | | | Ignore empty lines in indent filter #681
| * | | | | shorten argumentsDavid Lord2017-07-073-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add test for single line update changelog