Changeset 671

Timestamp:

09/22/05 21:02:15 (3 years ago)

Author:

adrian

Message:

Fixed #264 -- Added django.core.validators.isValidIPAddress4. Thanks, Hugo and Simon

Files:

• django/trunk/django/core/formfields.py (modified) (1 diff)
• django/trunk/django/core/validators.py (modified) (2 diffs)

django/trunk/django/core/formfields.py

@@ -688 +688 @@
-
-class IPAddressField(TextField):
+    def __init__(self, field_name, length=15, maxlength=15, is_required=False, validator_list=[]):
+        validator_list = [self.isValidIPAddress] + validator_list
+        TextField.__init__(self, field_name, length=length, maxlength=maxlength,
+            is_required=is_required, validator_list=validator_list)
+
+    def isValidIPAddress(self, field_data, all_data):
+        try:
+            validators.isValidIPAddress4(field_data, all_data)
+        except validators.ValidationError, e:
+            raise validators.CriticalValidationError, e.messages
+
-    def html2python(data):
-        return data or None

django/trunk/django/core/validators.py

@@ -20 +20 @@
-email_re = re.compile(r'^[-\w.+]+@\w[\w.-]+$')
-integer_re = re.compile(r'^-?\d+$')
+ip4_re = re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
-phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
-url_re = re.compile(r'^http://\S+$')
@@ -85 +86 @@
-        except ValidationError:
-            raise ValidationError, "Enter valid e-mail addresses separated by commas."
+
+def isValidIPAddress4(field_data, all_data):
+    if ip4_re.search(field_data):
+        valid_parts = [el for el in field_data.split('.') if 0 <= int(el) <= 255]
+        if len(valid_parts) == 4:
+            return
+    raise validators.ValidationError, "Please enter a valid IP address."
-
-def isNotEmpty(field_data, all_data):