From: Matteo Ferrando <matteo.ferrando2@gmail.com>
Date: Wed, 21 Mar 2018 16:47:46 +0000 (-0400)
Subject: add chars option to trim
X-Git-Tag: 2.11.0~58^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a5d522cb577cc455a1b022acd60a90e08ebfa1a;p=thirdparty%2Fjinja.git

add chars option to trim
---

diff --git a/CHANGES.rst b/CHANGES.rst
index 692a5161..fe99937d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -22,6 +22,8 @@ Unreleased
 -   Int and float literals can be written with the '_' separator for
     legibility, like 12_345. :pr:`923`
 -   Fix a bug causing deadlocks in ``LRUCache.setdefault``. :pr:`1000`
+-   The ``trim`` filter takes an optional string of characters to trim.
+    :pr:`828`
 
 
 Version 2.10.2
diff --git a/jinja2/filters.py b/jinja2/filters.py
index 488aab56..40dbfcb3 100644
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@ -757,9 +757,9 @@ def do_format(value, *args, **kwargs):
     return soft_unicode(value) % (kwargs or args)
 
 
-def do_trim(value):
-    """Strip leading and trailing whitespace."""
-    return soft_unicode(value).strip()
+def do_trim(value, chars=None):
+    """Strip leading and trailing characters, by default whitespace."""
+    return soft_unicode(value).strip(chars)
 
 
 def do_striptags(value):
diff --git a/tests/test_filters.py b/tests/test_filters.py
index cfa1f43d..33123f97 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -85,6 +85,14 @@ class TestFilter(object):
         out = tmpl.render()
         assert out == '&lt;&#34;&gt;&amp;'
 
+    @pytest.mark.parametrize(
+        ("chars", "expect"), [(None, "..stays.."), (".", "  ..stays"), (" .", "stays")]
+    )
+    def test_trim(self, env, chars, expect):
+        tmpl = env.from_string("{{ foo|trim(chars) }}")
+        out = tmpl.render(foo="  ..stays..", chars=chars)
+        assert out == expect
+
     def test_striptags(self, env):
         tmpl = env.from_string('''{{ foo|striptags }}''')
         out = tmpl.render(foo='  <p>just a small   \n <a href="#">'