Ticket #7913: 7913.diff

a/django/db/models/fields/__init__.py

@@ -288 +288 @@
-        if self.choices:
-            field_objs = [oldforms.SelectField]
-
-flatchoices
+get_flatchoices()
-        else:
-            field_objs = self.get_manipulator_field_objs()
-        return (field_objs, params)
@@ -362 +362 @@
-        return val
-
-    def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
-
+
+
-        first_choice = include_blank and blank_choice or []
-        if self.choices:
-            return first_choice + list(self.choices)
@@ -376 +377 @@
-    def get_choices_default(self):
-        return self.get_choices()
-
+    def get_flatchoices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
+        "Returns flattened choices with a default blank choice included."
+        first_choice = include_blank and blank_choice or []
+        return first_choices + list(self.flatchoices)
+
-    def _get_val_from_obj(self, obj):
-        if obj:
-            return getattr(obj, self.attname)
@@ -408 +414 @@
-    choices = property(_get_choices)
-
-    def _get_flatchoices(self):
+        """Flattened version of choices tuple."""
-        flat = []
-get_choices_default()
+choices
-            if type(value) in (list, tuple):
-                flat.extend(value)
-            else:
-                flat.append((choice,value))
-        return flat
-    flatchoices = property(_get_flatchoices)
-
+
-    def save_form_data(self, instance, data):
-        setattr(instance, self.name, data)
-

a/tests/modeltests/choices/models.py

@@ -36 +36 @@
-u'Male'
->>> s.get_gender_display()
-u'Female'
+
+# 7913
+>>> a.gender = ''
+>>> a.get_gender_display()
+u''
-"""}