From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 12 Jan 2017 14:55:20 +0000 (+0100)
Subject: Also restore original str method
X-Git-Tag: 2.9.5~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30f5d8b4d8f66c8ab261f1088cc0af6434f8ae2;p=thirdparty%2Fjinja.git

Also restore original str method
---

diff --git a/jinja2/filters.py b/jinja2/filters.py
index d3726b3b..ed1121f6 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 fdb78efb..0b81f920 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])"