Fix escape for Label with jinja template

tests/test_widgets.py

@@ -653,6 +653,19 @@ class TestLabel(WidgetTest):
     attrs = {'text': 'something'}
     expected = """<span>something</span>"""
 
+    def test_escape(self):
+        attrs = {'text': 'line 1<br />line 2'}
+        expected = '<span>line 1&lt;br /&gt;line 2</span>'
+        for engine in self._get_all_possible_engines():
+            yield (self._check_rendering_vs_expected,
+                engine, attrs, self.params, expected)
+
+        attrs = {'text': 'line 1<br />line 2', 'escape': False}
+        expected = '<span>line 1<br />line 2</span>'
+        for engine in self._get_all_possible_engines():
+            yield (self._check_rendering_vs_expected,
+                engine, attrs, self.params, expected)
+
 
 class TestForm(WidgetTest):
 

tw2/forms/templates/label.jinja

@@ -1 +1 @@
-<span {{ w.attrs|xmlattr }}>{{ w.text }}</span>
+<span {{ w.attrs|xmlattr }}>{% if w.escape %}{{ w.text|string }}{% else %}{{ w.text|safe }}{% endif %}</span>