From e623b5849a941b58a21ad34e06d877430ec72402 Mon Sep 17 00:00:00 2001
From: ThiefMaster <adrian@planetcoding.net>
Date: Sat, 12 Sep 2015 00:27:07 +0200
Subject: [PATCH] Support filters in set block

- e.g {% set foo | trim %}...{% endset %}
- closes #486
---
 CHANGES                 |  1 +
 docs/templates.rst      | 11 +++++++++++
 jinja2/compiler.py      |  7 ++++++-
 jinja2/nodes.py         |  2 +-
 jinja2/parser.py        |  3 ++-
 tests/test_core_tags.py | 13 +++++++++++++
 6 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 81098b3e7..cb8bfc1aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ Version 2.10
 - Added a `namespace` function that creates a special object which allows
   attribute assignment using the `set` tag.  This can be used to carry data
   across scopes, e.g. from a loop body to code that comes after the loop.
+- Added filter support to the block ``set`` tag.
 
 Version 2.9.6
 -------------
diff --git a/docs/templates.rst b/docs/templates.rst
index 650b55e63..7894a6e2f 100644
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -947,6 +947,17 @@ Example::
 
 The `navigation` variable then contains the navigation HTML source.
 
+.. versionchanged:: 2.10
+
+Starting with Jinja 2.10, the block assignment supports filters.
+
+Example::
+
+    {% set reply | wordwrap %}
+        You wrote:
+        {{ message }}
+    {% endset %}
+
 
 .. _extends:
 
diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index e69e5f1be..9a2c8c825 100644
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -1378,7 +1378,12 @@ def visit_AssignBlock(self, node, frame):
         self.newline(node)
         self.visit(node.target, frame)
         self.write(' = (Markup if context.eval_ctx.autoescape '
-                   'else identity)(concat(%s))' % block_frame.buffer)
+                   'else identity)(')
+        if node.filter is not None:
+            self.visit_Filter(node.filter, block_frame)
+        else:
+            self.write('concat(%s)' % block_frame.buffer)
+        self.write(')')
         self.pop_assign_tracking(frame)
         self.leave_frame(block_frame)
 
diff --git a/jinja2/nodes.py b/jinja2/nodes.py
index ab0e6b00c..b5fd62002 100644
--- a/jinja2/nodes.py
+++ b/jinja2/nodes.py
@@ -387,7 +387,7 @@ class Assign(Stmt):
 
 class AssignBlock(Stmt):
     """Assigns a block to a target."""
-    fields = ('target', 'body')
+    fields = ('target', 'filter', 'body')
 
 
 class Expr(Node):
diff --git a/jinja2/parser.py b/jinja2/parser.py
index 6d1fff6a9..c8653b1df 100644
--- a/jinja2/parser.py
+++ b/jinja2/parser.py
@@ -180,9 +180,10 @@ def parse_set(self):
         if self.stream.skip_if('assign'):
             expr = self.parse_tuple()
             return nodes.Assign(target, expr, lineno=lineno)
+        filter_node = self.parse_filter(None)
         body = self.parse_statements(('name:endset',),
                                      drop_needle=True)
-        return nodes.AssignBlock(target, body, lineno=lineno)
+        return nodes.AssignBlock(target, filter_node, body, lineno=lineno)
 
     def parse_for(self):
         """Parse a for loop."""
diff --git a/tests/test_core_tags.py b/tests/test_core_tags.py
index a5c129797..a6b1a4f73 100644
--- a/tests/test_core_tags.py
+++ b/tests/test_core_tags.py
@@ -444,6 +444,19 @@ def test_namespace_macro(self, env_trim):
                                     '{{ ns.a }}|{{ ns.b }}')
         assert tmpl.render() == '13|37'
 
+    def test_block_escaping_filtered(self):
+        env = Environment(autoescape=True)
+        tmpl = env.from_string('{% set foo | trim %}<em>{{ test }}</em>    '
+                               '{% endset %}foo: {{ foo }}')
+        assert tmpl.render(test='<unsafe>') == 'foo: <em>&lt;unsafe&gt;</em>'
+
+    def test_block_filtered(self, env_trim):
+        tmpl = env_trim.from_string(
+            '{% set foo | trim | length | string %} 42    {% endset %}'
+            '{{ foo }}')
+        assert tmpl.render() == '2'
+        assert tmpl.module.foo == u'2'
+
 
 @pytest.mark.core_tags
 @pytest.mark.with_