summaryrefslogtreecommitdiff
path: root/django/utils/html.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 21:14:27 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-08-07 12:00:22 +0200
commitee191715eae73362768184aa95206cf61bac5d38 (patch)
treef6ffc0bf4dfaea9f91cf8536ba2aeb9a69a81a6d /django/utils/html.py
parentfa3f0aa021bea85b9196ef154a32c7bb1023a1e9 (diff)
[py3] Fixed access to dict keys/values/items.
Diffstat (limited to 'django/utils/html.py')
-rw-r--r--django/utils/html.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/html.py b/django/utils/html.py
index e1263fbd66..4e888fc59b 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -84,7 +84,7 @@ def format_html(format_string, *args, **kwargs):
"""
args_safe = map(conditional_escape, args)
kwargs_safe = dict([(k, conditional_escape(v)) for (k, v) in
- kwargs.iteritems()])
+ six.iteritems(kwargs)])
return mark_safe(format_string.format(*args_safe, **kwargs_safe))
def format_html_join(sep, format_string, args_generator):