Ticket #6967: choices-fix.patch

django/db/models/fields/__init__.py

@@ -490 +490 @@
-
-    def formfield(self, **kwargs):
-        defaults = {'max_length': self.max_length}
+        if self._choices:
+            defaults['form_class'] = forms.ChoiceField
+            defaults['choices'] = self._choices
+            del defaults['max_length']
-        defaults.update(kwargs)
-        return super(CharField, self).formfield(**defaults)
-