mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23883 -- Stopped flatatt modifying its argument

Browse Source
This commit is contained in:
Tim Heap
2014-11-21 12:35:58 +11:00
committed by Claude Paroz
parent d8f00e1918
commit 5b17dcd8ef
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
django/forms/utils.py
View File

@@ -29,16 +29,17 @@ def flatatt(attrs):
The result is passed through 'mark_safe'.
"""
key_value_attrs = []
boolean_attrs = []
for attr, value in list(attrs.items()):
if value is True:
boolean_attrs.append((attr,))
del attrs[attr]
elif value is False:
del attrs[attr]
for attr, value in attrs.items():
if isinstance(value, bool):
if value:
boolean_attrs.append((attr,))
else:
key_value_attrs.append((attr, value))
return (
format_html_join('', ' {0}="{1}"', sorted(attrs.items())) +
format_html_join('', ' {0}="{1}"', sorted(key_value_attrs)) +
format_html_join('', ' {0}', sorted(boolean_attrs))
)

17
tests/forms_tests/tests/test_util.py
View File

@@ -27,6 +27,23 @@ class FormsUtilTestCase(TestCase):
self.assertEqual(flatatt({'class': "news", 'title': "Read this", 'required': False}), ' class="news" title="Read this"')
self.assertEqual(flatatt({}), '')
def test_flatatt_no_side_effects(self):
"""
Fixes #23883 -- Check that flatatt does not modify the dict passed in
"""
attrs = {'foo': 'bar', 'true': True, 'false': False}
attrs_copy = copy.copy(attrs)
self.assertEqual(attrs, attrs_copy)
first_run = flatatt(attrs)
self.assertEqual(attrs, attrs_copy)
self.assertEqual(first_run, ' foo="bar" true')
second_run = flatatt(attrs)
self.assertEqual(attrs, attrs_copy)
self.assertEqual(first_run, second_run)
def test_validation_error(self):
###################
# ValidationError #