Fixed #20439 -- Started deprecation of IPAddressField

django/db/models/fields/__init__.py

@@ -1312,6 +1312,8 @@ class IPAddressField(Field):
     description = _("IPv4 address")
 
     def __init__(self, *args, **kwargs):
+        warnings.warn("IPAddressField has been deprecated. Use GenericIPAddressField instead.",
+                      PendingDeprecationWarning)
         kwargs['max_length'] = 15
         Field.__init__(self, *args, **kwargs)
 

django/forms/fields.py

@@ -9,6 +9,7 @@ import datetime
 import os
 import re
 import sys
+import warnings
 from decimal import Decimal, DecimalException
 from io import BytesIO
 
@@ -1144,6 +1145,11 @@ class SplitDateTimeField(MultiValueField):
 class IPAddressField(CharField):
     default_validators = [validators.validate_ipv4_address]
 
+    def __init__(self, *args, **kwargs):
+        warnings.warn("IPAddressField has been deprecated. Use GenericIPAddressField instead.",
+                      PendingDeprecationWarning)
+        super(IPAddressField, self).__init__(*args, **kwargs)
+
     def to_python(self, value):
         if value in self.empty_values:
             return ''

docs/internals/deprecation.txt

@@ -436,6 +436,8 @@ these changes.
   :ref:`initial SQL data<initial-sql>` in ``myapp/models/sql/``. Move your
   custom SQL files to ``myapp/sql/``.
 
+* The model and form ``IPAddressField`` will be removed.
+
 * FastCGI support via the ``runfcgi`` management command will be
   removed. Please deploy your project using WSGI.
 

docs/ref/forms/fields.txt

@@ -657,6 +657,10 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: IPAddressField(**kwargs)
 
+    .. deprecated:: 1.7
+        This field has been deprecated in favour of
+        :class:`~django.forms.GenericIPAddressField`.
+
     * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.

docs/ref/models/fields.txt

@@ -849,6 +849,10 @@ An integer. The default form widget for this field is a
 
 .. class:: IPAddressField([**options])
 
+.. deprecated:: 1.7
+    This field has been deprecated in favour of
+    :class:`~django.db.models.GenericIPAddressField`.
+
 An IP address, in string format (e.g. "192.0.2.30"). The default form widget
 for this field is a :class:`~django.forms.TextInput`.
 

docs/releases/1.7.txt

@@ -529,3 +529,12 @@ to ``utils.py`` in an effort to unify all util and utils references:
 ``ModelAdmin.get_formsets`` has been deprecated in favor of the new
 :meth:`~django.contrib.admin.ModelAdmin.get_formsets_with_inlines`, in order to
 better handle the case of selecting showing inlines on a ``ModelAdmin``.
+
+``IPAddressField``
+~~~~~~~~~~~~~~~~~~
+
+The :class:`django.db.models.IPAddressField` and
+:class:`django.forms.IPAddressField` fields have been deprecated in favor of
+:class:`django.db.models.GenericIPAddressField` and
+:class:`django.forms.GenericIPAddressField`.
+

tests/field_deconstruction/tests.py

@@ -1,3 +1,4 @@
+import warnings
 from django.test import TestCase
 from django.db import models
 
@@ -173,6 +174,8 @@ class FieldDeconstructionTests(TestCase):
         self.assertEqual(kwargs, {})
 
     def test_ip_address_field(self):
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
             field = models.IPAddressField()
         name, path, args, kwargs = field.deconstruct()
         self.assertEqual(path, "django.db.models.IPAddressField")

tests/forms_tests/tests/test_error_messages.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import warnings
+
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import *
 from django.test import TestCase
@@ -192,6 +194,8 @@ class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
             'required': 'REQUIRED',
             'invalid': 'INVALID IP ADDRESS',
         }
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
             f = IPAddressField(error_messages=e)
         self.assertFormErrors(['REQUIRED'], f.clean, '')
         self.assertFormErrors(['INVALID IP ADDRESS'], f.clean, '127.0.0')

tests/forms_tests/tests/test_extra.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import datetime
+import warnings
 
 from django.forms import *
 from django.forms.extras import SelectDateWidget
@@ -535,6 +536,8 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         self.assertEqual(f.cleaned_data['field1'], 'some text,JP,2007-04-25 06:24:00')
 
     def test_ipaddress(self):
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
             f = IPAddressField()
         self.assertFormErrors(['This field is required.'], f.clean, '')
         self.assertFormErrors(['This field is required.'], f.clean, None)
@@ -544,6 +547,8 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '256.125.1.5')
 
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
             f = IPAddressField(required=False)
         self.assertEqual(f.clean(''), '')
         self.assertEqual(f.clean(None), '')

tests/inspectdb/models.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
+import warnings
 
 from django.db import models
 
@@ -49,6 +50,8 @@ class ColumnTypes(models.Model):
     file_path_field = models.FilePathField()
     float_field = models.FloatField()
     int_field = models.IntegerField()
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         ip_address_field = models.IPAddressField()
     gen_ip_adress_field = models.GenericIPAddressField(protocol="ipv4")
     pos_int_field = models.PositiveIntegerField()

tests/model_fields/models.py

@@ -1,5 +1,6 @@
 import os
 import tempfile
+import warnings
 
 from django.core.exceptions import ImproperlyConfigured
 
@@ -85,6 +86,8 @@ class VerboseNameField(models.Model):
     # Don't want to depend on Pillow/PIL in this test
     #field_image = models.ImageField("verbose field")
     field12 = models.IntegerField("verbose field12")
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         field13 = models.IPAddressField("verbose field13")
     field14 = models.GenericIPAddressField("verbose field14", protocol="ipv4")
     field15 = models.NullBooleanField("verbose field15")

tests/model_fields/tests.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import datetime
 from decimal import Decimal
 import unittest
+import warnings
 
 from django import test
 from django import forms
@@ -603,6 +604,8 @@ class PromiseTest(test.TestCase):
 
     def test_IPAddressField(self):
         lazy_func = lazy(lambda: '127.0.0.1', six.text_type)
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
             self.assertIsInstance(
                 IPAddressField().get_prep_value(lazy_func()),
                 six.text_type)

tests/serializers_regress/models.py

@@ -4,6 +4,7 @@ A test spanning all the capabilities of all the serializers.
 This class sets up a model for each model field type
 (except for image types, because of the Pillow/PIL dependency).
 """
+import warnings
 
 from django.db import models
 from django.contrib.contenttypes import generic
@@ -52,6 +53,8 @@ class BigIntegerData(models.Model):
 #    data = models.ImageField(null=True)
 
 class IPAddressData(models.Model):
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         data = models.IPAddressField(null=True)
 
 class GenericIPAddressData(models.Model):
@@ -199,6 +202,8 @@ class IntegerPKData(models.Model):
 #    data = models.ImageField(primary_key=True)
 
 class IPAddressPKData(models.Model):
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         data = models.IPAddressField(primary_key=True)
 
 class GenericIPAddressPKData(models.Model):

tests/string_lookup/models.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+import warnings
 
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
@@ -49,6 +50,8 @@ class Base(models.Model):
 class Article(models.Model):
     name = models.CharField(max_length=50)
     text = models.TextField()
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         submitted_from = models.IPAddressField(blank=True, null=True)
 
     def __str__(self):