Changeset 6357

Timestamp:

09/16/07 06:38:32 (10 months ago)

Author:

mtredinnick

Message:

Fixed #4067 -- Fixed validation of IPAddressFields in newforms. Thanks to neils and the team in the Copenhagen sprint group.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/newforms/fields.py (modified) (2 diffs)
• django/trunk/docs/newforms.txt (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (1 diff)

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

@@ -881 +881 @@
-        validators.isValidIPAddress4(field_data, None)
-
+    def formfield(self, **kwargs):
+        defaults = {'form_class': forms.IPAddressField}
+        defaults.update(kwargs)
+        return super(IPAddressField, self).formfield(**defaults)
+
-class NullBooleanField(Field):
-    empty_strings_allowed = False

django/trunk/django/newforms/fields.py

@@ -27 +27 @@
-    'ChoiceField', 'NullBooleanField', 'MultipleChoiceField',
-    'ComboField', 'MultiValueField', 'FloatField', 'DecimalField',
-
+ 'IPAddressField',
-)
-
@@ -636 +636 @@
-            return datetime.datetime.combine(*data_list)
-        return None
+
+ipv4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$')
+
+class IPAddressField(RegexField):
+    def __init__(self, *args, **kwargs):
+        RegexField.__init__(self, ipv4_re,
+                            error_message=ugettext(u'Enter a valid IPv4 address.'),
+                            *args, **kwargs)

django/trunk/docs/newforms.txt

@@ -1285 +1285 @@
-These control the range of values permitted in the field.
-
+``IPAddressField``
+~~~~~~~~~~~~~~~~~~
+
+    * Default widget: ``TextInput``
+    * Empty value: ``''`` (an empty string)
+    * Normalizes to: A Unicode object.
+    * Validates that the given value is a valid IPv4 address, using a regular
+      expression.
+
-``MultipleChoiceField``
-~~~~~~~~~~~~~~~~~~~~~~~
@@ -1711 +1720 @@
-    ``ImageField``                   ``ImageField``
-    ``IntegerField``                 ``IntegerField``
-Char
+IPAddress
-    ``ManyToManyField``              ``ModelMultipleChoiceField`` (see
-                                     below)

django/trunk/tests/regressiontests/forms/tests.py

@@ -3835 +3835 @@
-{'field1': u'some text,JP,2007-04-25 06:24:00'}
-
+
+# IPAddressField ##################################################################
+
+>>> f = IPAddressField()
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('127.0.0.1')
+u'127.0.0.1'
+>>> f.clean('foo')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('127.0.0.')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('1.2.3.4.5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('256.125.1.5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+
+>>> f = IPAddressField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean(None)
+u''
+>>> f.clean('127.0.0.1')
+u'127.0.0.1'
+>>> f.clean('foo')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('127.0.0.')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('1.2.3.4.5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+>>> f.clean('256.125.1.5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IPv4 address.']
+
-#################################
-# Tests of underlying functions #