Ticket #5328: newforms-choice-field-clean-r6040.diff

fields.py

@@ -469 +469 @@
         """
         value = super(ChoiceField, self).clean(value)
         if value in EMPTY_VALUES:
-            value = u''
+            return u''
         value = smart_unicode(value)
-        if value == u'':
-            return value
         valid_values = set([smart_unicode(k) for k, v in self.choices])
         if value not in valid_values:
             raise ValidationError(ugettext(u'Select a valid choice. That choice is not one of the available choices.'))