Make admin form lists work a bit better with non-ascii content in non-unicode tables.

- Legacy-Id: 3203
2011-07-23 12:23:10 +00:00 · 2011-07-23 12:23:10 +00:00 · aeff74a467
parent 6fcf8ad76d
commit aeff74a467
1 changed files with 1 additions and 1 deletions
--- a/django/forms/models.py
+++ b/django/forms/models.py
@ -965,7 +965,7 @@ class ModelChoiceField(ChoiceField):
        generate the labels for the choices presented by this object. Subclasses
        can override this method to customize the display of the choices.
        """
-        return smart_unicode(obj)
+        return smart_unicode(obj, errors='ignore')

    def _get_choices(self):
        # If self._choices is set, then somebody must have manually set