Ticket #6564: usstate.diff

django/db/models/fields/__init__.py

@@ -1055 +1055 @@
         return [oldforms.USStateField]
 
     def formfield(self, **kwargs):
-        from django.contrib.localflavor.us.forms import USStateSelect
-        defaults = {'widget': USStateSelect}
+        from django.contrib.localflavor.us.forms import USStateField as USStateFormField
+        defaults = {'form_class': USStateFormField}
         defaults.update(kwargs)
         return super(USStateField, self).formfield(**defaults)
 

django/contrib/localflavor/us/forms.py

@@ -3 +3 @@
 """
 
 from django.newforms import ValidationError
-from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES, ChoiceField
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext
 import re
@@ -77 +77 @@
             raise ValidationError(self.error_messages['invalid'])
         return u'%s-%s-%s' % (area, group, serial)
 
-class USStateField(Field):
+class USStateField(ChoiceField):
     """
     A form field that validates its input is a U.S. state name or abbreviation.
     It normalizes the input to the standard two-leter postal service
@@ -86 +86 @@
     default_error_messages = {
         'invalid': u'Enter a U.S. state or territory.',
     }
-
+    
+    def __init__(self, empty_label=u'---------', *args, **kwargs):
+        from us_states import STATE_CHOICES
+        ChoiceField.__init__(self, (('', empty_label),) + STATE_CHOICES, *args, **kwargs)
+    
     def clean(self, value):
         from us_states import STATES_NORMALIZED
         super(USStateField, self).clean(value)
@@ -102 +106 @@
             except KeyError:
                 pass
         raise ValidationError(self.error_messages['invalid'])
-
-class USStateSelect(Select):
-    """
-    A Select widget that uses a list of U.S. states/territories as its choices.
-    """
-    def __init__(self, attrs=None):
-        from us_states import STATE_CHOICES
-        super(USStateSelect, self).__init__(attrs, choices=STATE_CHOICES)