Ticket #3370: models-utf8.diff

models.py

@@ -8 +8 @@
 from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList
 from fields import Field, ChoiceField
 from widgets import Select, SelectMultiple, MultipleHiddenInput
+from django.conf import settings
 
 __all__ = ('save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields',
            'ModelChoiceField', 'ModelMultipleChoiceField')
@@ -38 +39 @@
     for f in opts.fields:
         if not f.editable or isinstance(f, models.AutoField):
             continue
-        setattr(instance, f.name, clean_data[f.name])
+        try:
+          setattr(instance, f.name, clean_data[f.name].encode(settings.DEFAULT_CHARSET))
+        except:
+          setattr(instance, f.name, clean_data[f.name])
     if commit:
         instance.save()
         for f in opts.many_to_many: