diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2017-01-12 15:55:29 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2017-01-12 15:55:29 +0100 |
| commit | 095663c73418b0b2696a7f15ddae9e366d045d09 (patch) | |
| tree | de7656f44fa470f278c5fe52f6c54cac38be4f63 | |
| parent | 818ae6506ae41645baea2b901921c1881b91ea91 (diff) | |
| parent | f30f5d8b4d8f66c8ab261f1088cc0af6434f8ae2 (diff) | |
| download | jinja2-095663c73418b0b2696a7f15ddae9e366d045d09.tar.gz | |
Merge branch '2.9-maintenance'
| -rw-r--r-- | jinja2/filters.py | 5 | ||||
| -rw-r--r-- | tests/test_regression.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/jinja2/filters.py b/jinja2/filters.py index d3726b3..ed1121f 100644 --- a/jinja2/filters.py +++ b/jinja2/filters.py @@ -18,7 +18,7 @@ from jinja2.utils import Markup, escape, pformat, urlize, soft_unicode, \ unicode_urlencode, htmlsafe_json_dumps from jinja2.runtime import Undefined from jinja2.exceptions import FilterArgumentError -from jinja2._compat import imap, string_types, text_type, iteritems +from jinja2._compat import imap, string_types, text_type, iteritems, PY2 _word_re = re.compile(r'\w+', re.UNICODE) @@ -695,6 +695,9 @@ def do_round(value, precision=0, method='common'): # debugging. _GroupTuple = namedtuple('_GroupTuple', ['grouper', 'list']) _GroupTuple.__repr__ = tuple.__repr__ +_GroupTuple.__str__ = tuple.__str__ +if not PY2: + _GroupTuple.__unicode__ = tuple.__unicode__ @environmentfilter def do_groupby(environment, value, attribute): diff --git a/tests/test_regression.py b/tests/test_regression.py index fdb78ef..0b81f92 100644 --- a/tests/test_regression.py +++ b/tests/test_regression.py @@ -504,3 +504,4 @@ class TestBug(object): assert t.grouper == 'foo' assert t.list == [1, 2] assert repr(t) == "('foo', [1, 2])" + assert str(t) == "('foo', [1, 2])" |