innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #28502 -- Complemented stringformat tuple handling/test. 

An additional test and a code change were suggested in a late review.
This commit is contained in:
Claude Paroz 2017-08-22 14:45:08 +02:00 committed by Tim Graham
parent 7bba82453c
commit ed77bea582
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/defaultfilters.py
View File

@ -223,9 +223,9 @@ def stringformat(value, arg):
See https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting See https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting
for documentation of Python string formatting. for documentation of Python string formatting.
""" """
try:
if isinstance(value, tuple): if isinstance(value, tuple):
return ('%' + str(arg)) % str(value) value = str(value)
try:
return ("%" + str(arg)) % value return ("%" + str(arg)) % value
except (ValueError, TypeError): except (ValueError, TypeError):
return "" return ""

2
docs/releases/1.11.5.txt
View File

@ -13,3 +13,5 @@ Bugfixes
in GEOS 3.6.2) (:ticket:`28441`). in GEOS 3.6.2) (:ticket:`28441`).
* Fixed test database creation with ``cx_Oracle`` 6 (:ticket:`28498`). * Fixed test database creation with ``cx_Oracle`` 6 (:ticket:`28498`).
* Fixed select widget rendering when option values are tuples (:ticket:`28502`).

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

@ -39,3 +39,4 @@ class FunctionTests(SimpleTestCase):
self.assertEqual(stringformat(1, 'z'), '') self.assertEqual(stringformat(1, 'z'), '')
self.assertEqual(stringformat(object(), 'd'), '') self.assertEqual(stringformat(object(), 'd'), '')
self.assertEqual(stringformat(None, 'd'), '') self.assertEqual(stringformat(None, 'd'), '')
self.assertEqual(stringformat((1, 2, 3), 'd'), '')