Ticket #4359: unicode-deleted-objects.diff

contrib/admin/views/main.py

@@ -12 +12 @@
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.utils.html import escape
 from django.utils.text import capfirst, get_text_list
-from django.utils.encoding import smart_unicode, smart_str
+from django.utils.encoding import smart_unicode, smart_str, force_unicode
 from django.utils.translation import ugettext as _
 import operator
 
@@ -503 +503 @@
 
     # Populate deleted_objects, a data structure of all related objects that
     # will also be deleted.
-    deleted_objects = ['%s: <a href="../../%s/">%s</a>' % (capfirst(opts.verbose_name), object_id, escape(obj)), []]
+    deleted_objects = ['%s: <a href="../../%s/">%s</a>' % (capfirst(force_unicode(opts.verbose_name)), object_id, escape(obj)), []]
     perms_needed = sets.Set()
     _get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1)