mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-30 07:06:18 +01:00
Code Issues Releases Wiki Activity

Fixed #28502 -- Made stringformat template filter accept tuples

Browse Source
This commit is contained in:
Srinivas Reddy Thatiparthy 2017-08-16 17:57:59 +05:30 committed by Claude Paroz
parent 9229e005aa
commit 4ead705cb3
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/defaultfilters.py
View File

@ -224,6 +224,8 @@ def stringformat(value, arg):
for documentation of Python string formatting. for documentation of Python string formatting.
""" """
try: try:
if isinstance(value, tuple):
return ('%' + str(arg)) % str(value)
return ("%" + str(arg)) % value return ("%" + str(arg)) % value
except (ValueError, TypeError): except (ValueError, TypeError):
return "" return ""

2
tests/template_tests/filter_tests/test_stringformat.py
View File

@ -30,6 +30,8 @@ class FunctionTests(SimpleTestCase):
def test_format(self): def test_format(self):
self.assertEqual(stringformat(1, '03d'), '001') self.assertEqual(stringformat(1, '03d'), '001')
self.assertEqual(stringformat([1, None], 's'), '[1, None]') 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}, 's'), '{1, 2}')
self.assertEqual(stringformat({1: 2, 2: 3}, 's'), '{1: 2, 2: 3}') self.assertEqual(stringformat({1: 2, 2: 3}, 's'), '{1: 2, 2: 3}')