From 45fab74561a2b339cde922c196ab3ccf998bad10 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 12 Jul 2013 16:05:14 -0400 Subject: [PATCH] [1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield() Thanks Jeff250. Backport of f2cb94f1c0 from master --- django/db/models/fields/__init__.py | 5 ++++- tests/model_fields/tests.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index c0dce2e58e..22123467cd 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1160,7 +1160,10 @@ class GenericIPAddressField(Field): 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 index 6abeed8c42..703c0ee8f6 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -468,3 +468,16 @@ class BinaryFieldTests(test.TestCase): 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')