From aeff74a467d4123ad20480d2c108c86a65a4a4de Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 23 Jul 2011 12:23:10 +0000 Subject: [PATCH] Make admin form lists work a bit better with non-ascii content in non-unicode tables. - Legacy-Id: 3203 --- django/forms/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/forms/models.py b/django/forms/models.py index cc43612bf..d639bc9f5 100644 --- 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