Ticket #1466: zip.diff

django/db/models/fields/__init__.py

@@ -689 +689 @@
     def validate(self, field_data, all_data):
         validators.isValidPhone(field_data, all_data)
 
+class USZipCodeField(Field):
+    def get_manipulator_field_objs(self):
+        return [forms.USZipCodeField]
+
+    def validate(self, field_data, all_data):
+        validators.isValidUSZipCode(field_data, all_data)
+
 class PositiveIntegerField(IntegerField):
     def get_manipulator_field_objs(self):
         return [forms.PositiveIntegerField]

django/forms/__init__.py

@@ -937 +937 @@
         except validators.ValidationError, e:
             raise validators.CriticalValidationError, e.messages
 
+class USZipCodeField(TextField):
+    "A convenience FormField for validating US Zip Codes (e.g. '12345 or 12345-1234')"
+    def __init__(self, field_name, is_required=False, validator_list=[]):
+        validator_list = [self.isValidUSZipCode] + validator_list
+        TextField.__init__(self, field_name, length=10, maxlength=10,
+            is_required=is_required, validator_list=validator_list)
+
+    def isValidUSZipCode(self, field_data, all_data):
+        try:
+            validators.isValidUSZipCode(field_data, all_data)
+        except validators.ValidationError, e:
+            raise validators.CriticalValidationError, e.messages
+
 class USStateField(TextField):
     "A convenience FormField for validating U.S. states (e.g. 'IL')"
     def __init__(self, field_name, is_required=False, validator_list=None):

django/core/validators.py

@@ -29 +29 @@
 phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
 slug_re = re.compile(r'^[-\w]+$')
 url_re = re.compile(r'^https?://\S+$')
+uszipcode_re = re.compile(r'^(\d{5}$)|(\d{5}-\d{4}$)')
 
 lazy_inter = lazy(lambda a,b: str(a) % b, str)
 
@@ -220 +221 @@
     if field_data.upper() not in states:
         raise ValidationError, gettext("Enter a valid U.S. state abbreviation.")
 
+def isValidUSZipCode(field_data, all_data):
+    if not uszipcode_re.search(field_data):
+        raise ValidationError, gettext('Zip Codes must be in XXXXX or XXXXX-XXXX format. "%s" is invalid.') % field_data
+
 def hasNoProfanities(field_data, all_data):
     """
     Checks that the given string has no profanities in it. This does a simple

docs/forms.txt

@@ -29 +29 @@
         address = models.CharField(maxlength=100, blank=True)
         city = models.CharField(maxlength=50, blank=True)
         state = models.USStateField()
-        zip_code = models.CharField(maxlength=5, blank=True)
+        zip_code = models.USZipCodeField()
         place_type = models.IntegerField(choices=PLACE_TYPES)
 
         class Admin:
@@ -518 +518 @@
     * isWellFormedXmlFragment
     * isExistingURL
     * isValidUSState
+    * isValidUSZipCode
     * hasNoProfanities
 
 There are also a group of validators that are slightly more flexible. For