Commit Graph

1945 Commits

Author SHA1 Message Date
Armin Ronacher
e1e7735c76
Remove old GPL licensed emacs support
This is unmaintained anyways and we do not want to ship non BSD code.

Fixes #833
2018-03-28 23:31:03 +02:00
David Lord
3bb2ef8b83
Merge pull request #826 from terminalmage/issue823
Fix escaped characters in indent filter
2018-03-22 11:59:02 -07:00
Erik Johnson
a2f5e2c797
Remove unescape method for fixing concatenation issue
This ensures that we only concatenate Markup instances to other Markup
instances.
2018-03-19 21:56:54 -05:00
Erik Johnson
8ef99c3d6a
Add .pytest_cache/ to gitignore 2018-03-19 16:03:29 -05:00
Erik Johnson
5db859c5c3
Apply unesacpe fix when blank is True 2018-03-19 16:03:00 -05:00
Erik Johnson
50995cb7f9
Fix spelling in docstring 2018-03-19 14:30:46 -05:00
Erik Johnson
863558131c
Add test cases for quotes and expand coverage to include Markup input 2018-03-19 14:18:27 -05:00
Erik Johnson
e937c8a0de
Fix cases where filter input is not a Markup type
The previous commit assumes that the filter will always be a Markup
type, which is not correct.
2018-03-19 14:17:35 -05:00
Erik Johnson
bfdc8467d4
Fix escaped characters in indent filter
This unescapes after concatenating, to fix a bug introduced in Jinja
2.10 where lines concatenated contain escaped versions of non-ascii
characters.
2018-03-19 13:27:38 -05:00
Sean Sabbage
34b1ab9f6e Correct documentation for min method (#825) 2018-03-19 15:05:42 +01:00
David Lord
3d7cfc844b
Merge pull request #820 from jdufresne/typo
Fix typo: apparenlty -> apparently.
2018-03-05 06:23:40 -08:00
Jon Dufresne
a922a5f331 Fix typo: apparenlty -> apparently. 2018-03-04 12:15:52 -08:00
luzpaz
f2e9280f5e Fix typos (#815)
Found via `codespell -q 3` using v1.12.0.dev0
2018-02-18 15:57:01 +01:00
David Lord
041b7385c3
Merge pull request #806 from methane/lazy-async-patch
Lazy asyncsupport.patch_all()
2018-02-06 07:52:32 -08:00
David Lord
989a7db234
add changelog
fix unrelated docs issue
2018-02-06 07:48:10 -08:00
INADA Naoki
2c49d14cec Lazy asyncsupport.patch_all()
fixes #765
2018-02-06 21:52:57 +09:00
Godefroid Chapelle
c0c3b7879e Remove old statement about Python 3 (#803)
There is now Python 3 support...
2018-01-30 12:02:33 -08:00
Toshio Kuratomi
d6c016ba77 More closely match python splatting for calls
In Python, it's legal to use splats in function calls like this:

  call_function('123', *b, c=5, **d)

Prior to this change, jinja2 did not allow that. It mandated that all
splatting had to take place at the end of the call:

  call_function('123', c=5, *b, **d)

This commit allows both orders.

Additionally, this commit adds tests for more things that are illegal:
namely giving a function a positional argument after using a splat to
unpack positional arguments or giving a function a named argument after
using a double splat to unpack keyword arguments.
2018-01-29 15:44:46 -08:00
David Lord
96cd53d8ff
Merge pull request #799 from mkrizek/native-concat-list
Allow to pass a list to native_concat
2018-01-23 08:31:30 -08:00
David Lord
1f60059729
fix code block markup
closes #800
2018-01-18 08:56:55 -08:00
Martin Krizek
08a6faef2e Don't check for generator if not needed 2018-01-17 23:09:23 +01:00
Martin Krizek
9ef99dcd82 Allow to pass a list to native_concat 2018-01-17 21:38:58 +01:00
David Lord
fe3dadacdf
Merge pull request #787 from SabujXi/patch-1
Fix typo instanciable > instantiable
2017-12-01 10:27:13 -08:00
Md. Sabuj Sarker
78928bffab
Fix typo instanciable > instantiable 2017-12-02 00:10:39 +06:00
David Lord
9b255f4c36
Merge pull request #783 from luzpaz/trivial-typos
Trivial typos
2017-11-08 18:21:47 -07:00
Unknown
778ccb22e9 Trivial typos
Most non-user facing.
2017-11-08 20:02:28 -05:00
David Lord
b2dd36b60f
Bump version number to 2.11.dev 2017-11-08 12:02:36 -08:00
David Lord
78d2f67214
Bump version number to 2.10 2017-11-08 11:58:35 -08:00
David Lord
d9d3fc32f0
clean up MANIFEST.in
clean up make-release.py for py3
add rst extension to CHANGES for GitHub
clean up changelog formatting
2017-11-08 10:53:47 -08:00
ThiefMaster
072cdf97fa Support filters in set block
- e.g {% set foo | trim %}...{% endset %}
- closes #486
2017-10-31 23:04:45 +01:00
David Lord
d17c7dbbf0
Merge pull request #708 from jctanner/NATIVE_TYPES
Add support for the Environment to optionally return native types.
2017-10-31 12:16:10 -07:00
David Lord
6a7a263bc0
Merge branch 'master' into NATIVE_TYPES 2017-10-31 08:51:53 -07:00
Ricardo Lafuente
31f92b5947 Fix typo in docstring (#779) 2017-10-16 13:11:44 +02:00
David Lord
c3147611ec
codecov needs argparse on 2.6 2017-10-08 13:15:09 -07:00
Eli Boyarski
4750cf7c69 Minor docstring grammar fix (#772) 2017-09-18 16:24:38 +02:00
Adrian Moennich
fc5be479dd s/Add/Added/ in CHANGES
Pretty much all other entries also use past tense
2017-08-22 23:24:52 +02:00
Adrian Moennich
f3b6368e90 Merge branch '2.9-maintenance' 2017-08-22 23:17:15 +02:00
Adrian Moennich
cde2a54b87 Compile elif tag to elif instead of else: if
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
2017-08-22 23:12:09 +02:00
Armin Ronacher
203540afcd Merge branch '2.9-maintenance' 2017-08-09 09:07:04 +02:00
Armin Ronacher
d117425f5e Added a changelog entry 2017-08-09 09:06:39 +02:00
Zac Medico
60a7e775d4 Fix regression in 2.9 involving unsafe Context.get_all() usage
Since commit d67f0fd4cc, callers
of Context.get_all() need to make a copy it they're going to
modify the result.

Fixes: d67f0fd4cc ("Generalize scoping.  This fixes #603")
2017-08-09 09:05:54 +02:00
James Tanner
68820c3976 quickly fix py3 tests 2017-07-25 22:11:22 -04:00
James Tanner
2ffeb693e3 Add requested patch for safe_repr and nodes.Impossible 2017-07-25 21:48:12 -04:00
Adrian
a5d9243462 Merge branch 'master' into NATIVE_TYPES 2017-07-14 17:19:17 +02:00
David Lord
5828b8ba4e Merge pull request #672 from alexk307/tests-memcached-bytecode-cache
Adds tests for the memcached bytecode cache module
2017-07-09 09:00:57 -07:00
David Lord
a675c85399
rewrite tests to match usage 2017-07-09 08:45:13 -07:00
Alex Kahan
6e74191f82
Adds tests for the memcached bytecode cache module 2017-07-09 08:45:05 -07:00
David Lord
711ad9dc21 Merge pull request #692 from dnmvisser/dictsort_reverse
Dictsort reverse
2017-07-08 09:10:33 -07:00
David Lord
34ca7f17c2
add test and changelog
use ignore_case function
2017-07-08 09:04:29 -07:00
Dick Visser
10fc8afc15
'reverse' option for dictsort 2017-07-08 08:54:34 -07:00