Fixed #20740 -- GenericIPAddressField should pass protocol to formfie…

…ld() Thanks Jeff250.
django · Jul 12, 2013 · f2cb94f · f2cb94f
1 parent a7d97a6
commit f2cb94f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
@@ -1334,7 +1334,10 @@ def get_prep_value(self, value):
         return value
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.GenericIPAddressField}
+        defaults = {
+            'protocol': self.protocol,
+            'form_class': forms.GenericIPAddressField,
+        }
         defaults.update(kwargs)
         return super(GenericIPAddressField, self).formfield(**defaults)
 

diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
@@ -468,3 +468,16 @@ def test_set_and_retrieve(self):
     def test_max_length(self):
         dm = DataModel(short_data=self.binary_data*4)
         self.assertRaises(ValidationError, dm.full_clean)
+
+class GenericIPAddressFieldTests(test.TestCase):
+    def test_genericipaddressfield_formfield_protocol(self):
+        """
+        Test that GenericIPAddressField with a specified protocol does not
+        generate a formfield with no specified protocol. See #20740.
+        """
+        model_field = models.GenericIPAddressField(protocol='IPv4')
+        form_field = model_field.formfield()
+        self.assertRaises(ValidationError, form_field.clean, '::1')
+        model_field = models.GenericIPAddressField(protocol='IPv6')
+        form_field = model_field.formfield()
+        self.assertRaises(ValidationError, form_field.clean, '127.0.0.1')