1
0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00

Fixed #23883 -- Stopped flatatt modifying its argument

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

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))
)