Removed IPAddressField per deprecation timeline; refs #20439.

2 files changed, 10 insertions, 28 deletions

diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index 2c6b707b88..9a6a3f1f36 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -168,16 +168,15 @@ class VerboseNameField(models.Model):
     # Don't want to depend on Pillow in this test
     #field_image = models.ImageField("verbose field")
     field12 = models.IntegerField("verbose field12")
-    field13 = models.IPAddressField("verbose field13")
-    field14 = models.GenericIPAddressField("verbose field14", protocol="ipv4")
-    field15 = models.NullBooleanField("verbose field15")
-    field16 = models.PositiveIntegerField("verbose field16")
-    field17 = models.PositiveSmallIntegerField("verbose field17")
-    field18 = models.SlugField("verbose field18")
-    field19 = models.SmallIntegerField("verbose field19")
-    field20 = models.TextField("verbose field20")
-    field21 = models.TimeField("verbose field21")
-    field22 = models.URLField("verbose field22")
+    field13 = models.GenericIPAddressField("verbose field13", protocol="ipv4")
+    field14 = models.NullBooleanField("verbose field14")
+    field15 = models.PositiveIntegerField("verbose field15")
+    field16 = models.PositiveSmallIntegerField("verbose field16")
+    field17 = models.SlugField("verbose field17")
+    field18 = models.SmallIntegerField("verbose field18")
+    field19 = models.TextField("verbose field19")
+    field20 = models.TimeField("verbose field20")
+    field21 = models.URLField("verbose field21")
 
 
 class GenericIPAddress(models.Model):
@@ -323,7 +322,6 @@ class AllFieldsModel(models.Model):
     file_path = models.FilePathField()
     floatf = models.FloatField()
     integer = models.IntegerField()
-    ip_address = models.IPAddressField()
     generic_ip = models.GenericIPAddressField()
     null_boolean = models.NullBooleanField()
     positive_integer = models.PositiveIntegerField()
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index a9ce43cae6..60a1f419ed 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -75,7 +75,7 @@ class BasicFieldTests(test.TestCase):
 
     def test_field_verbose_name(self):
         m = VerboseNameField
-        for i in range(1, 23):
+        for i in range(1, 22):
             self.assertEqual(m._meta.get_field('field%d' % i).verbose_name,
                              'verbose field%d' % i)
 
@@ -819,22 +819,6 @@ class PromiseTest(test.TestCase):
             IPAddressField().get_prep_value(lazy_func()),
             six.text_type)
 
-    def test_IPAddressField_deprecated(self):
-        class IPAddressModel(models.Model):
-            ip = IPAddressField()
-
-        model = IPAddressModel()
-        self.assertEqual(
-            model.check(),
-            [checks.Warning(
-                'IPAddressField has been deprecated. Support for it '
-                '(except in historical migrations) will be removed in Django 1.9.',
-                hint='Use GenericIPAddressField instead.',
-                obj=IPAddressModel._meta.get_field('ip'),
-                id='fields.W900',
-            )],
-        )
-
     def test_GenericIPAddressField(self):
         lazy_func = lazy(lambda: '127.0.0.1', six.text_type)
         self.assertIsInstance(