Fixed #28502 -- Made stringformat template filter accept tuples

srinivasreddy · claudep · commit 4ead705cb3cf · 2017-08-21T09:04:43.000+02:00
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
@@ -224,6 +224,8 @@ def stringformat(value, arg):
     for documentation of Python string formatting.
     """
     try:
+        if isinstance(value, tuple):
+            return ('%' + str(arg)) % str(value)
         return ("%" + str(arg)) % value
     except (ValueError, TypeError):
         return ""
diff --git a/tests/template_tests/filter_tests/test_stringformat.py b/tests/template_tests/filter_tests/test_stringformat.py
@@ -30,6 +30,8 @@ class FunctionTests(SimpleTestCase):
     def test_format(self):
         self.assertEqual(stringformat(1, '03d'), '001')
         self.assertEqual(stringformat([1, None], 's'), '[1, None]')
+        self.assertEqual(stringformat((1, 2, 3), 's'), '(1, 2, 3)')
+        self.assertEqual(stringformat((1,), 's'), '(1,)')
         self.assertEqual(stringformat({1, 2}, 's'), '{1, 2}')
         self.assertEqual(stringformat({1: 2, 2: 3}, 's'), '{1: 2, 2: 3}')
 
