Ticket #4266: admin_list_smart_str.diff

django/contrib/admin/templatetags/admin_list.py

@@ -7 +7 @@
 from django.utils.html import escape
 from django.utils.text import capfirst
 from django.utils.translation import get_date_formats, get_partial_date_formats
+from django.utils.encoding import smart_str
 from django.template import Library
 import datetime
 
@@ -177 +178 @@
             elif f.choices:
                 result_repr = dict(f.choices).get(field_val, EMPTY_CHANGELIST_VALUE)
             else:
-                result_repr = escape(str(field_val))
+                result_repr = escape(smart_str(field_val))
         if result_repr == '':
             result_repr = ' '
         # If list_display_links not defined, add the link tag to the first field