Ticket #4958: unicode_label-5751.diff

django/contrib/admin/options.py

@@ -88 +88 @@
         classes = []
         if self.is_checkbox:
             classes.append(u'vCheckboxLabel')
-            contents = escape(self.field.label)
+            contents = escape(force_unicode(self.field.label))
         else:
-            contents = escape(self.field.label) + u':'
+            contents = escape(force_unicode(self.field.label)) + u':'
         if self.field.field.required:
             classes.append(u'required')
         if not self.is_first: