From 9ce36512fa925231b0496cc10f7d114c069c7c06 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 18 Nov 2014 11:42:08 -0500
Subject: [PATCH] Removed backwards compatibility shims for "util" modules per
 deprecation timeline.

refs #17627.
---
 django/contrib/admin/util.py           |  9 ---------
 django/contrib/gis/db/backends/util.py | 10 ----------
 django/db/backends/util.py             | 10 ----------
 django/forms/util.py                   |  9 ---------
 tests/forms_tests/tests/test_fields.py |  3 ---
 5 files changed, 41 deletions(-)
 delete mode 100644 django/contrib/admin/util.py
 delete mode 100644 django/contrib/gis/db/backends/util.py
 delete mode 100644 django/db/backends/util.py
 delete mode 100644 django/forms/util.py

diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
deleted file mode 100644
index 416b75e7b2c..00000000000
--- a/django/contrib/admin/util.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn(
-    "The django.contrib.admin.util module has been renamed. "
-    "Use django.contrib.admin.utils instead.", RemovedInDjango19Warning)
-
-from django.contrib.admin.utils import *  # NOQA
diff --git a/django/contrib/gis/db/backends/util.py b/django/contrib/gis/db/backends/util.py
deleted file mode 100644
index 08f1ca8d808..00000000000
--- a/django/contrib/gis/db/backends/util.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn(
-    "The django.contrib.gis.db.backends.util module has been renamed. "
-    "Use django.contrib.gis.db.backends.utils instead.",
-    RemovedInDjango19Warning, stacklevel=2)
-
-from django.contrib.gis.db.backends.utils import *  # NOQA
diff --git a/django/db/backends/util.py b/django/db/backends/util.py
deleted file mode 100644
index 57978309749..00000000000
--- a/django/db/backends/util.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn(
-    "The django.db.backends.util module has been renamed. "
-    "Use django.db.backends.utils instead.", RemovedInDjango19Warning,
-    stacklevel=2)
-
-from django.db.backends.utils import *  # NOQA
diff --git a/django/forms/util.py b/django/forms/util.py
deleted file mode 100644
index e093068275f..00000000000
--- a/django/forms/util.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn(
-    "The django.forms.util module has been renamed. "
-    "Use django.forms.utils instead.", RemovedInDjango19Warning, stacklevel=2)
-
-from django.forms.utils import *  # NOQA
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index ea6e8424751..d04001b6b2c 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -1274,7 +1274,6 @@ class FieldsTests(SimpleTestCase):
             ('/django/forms/forms.py', 'forms.py'),
             ('/django/forms/formsets.py', 'formsets.py'),
             ('/django/forms/models.py', 'models.py'),
-            ('/django/forms/util.py', 'util.py'),
             ('/django/forms/utils.py', 'utils.py'),
             ('/django/forms/widgets.py', 'widgets.py')
         ]
@@ -1295,7 +1294,6 @@ class FieldsTests(SimpleTestCase):
             ('/django/forms/forms.py', 'forms.py'),
             ('/django/forms/formsets.py', 'formsets.py'),
             ('/django/forms/models.py', 'models.py'),
-            ('/django/forms/util.py', 'util.py'),
             ('/django/forms/utils.py', 'utils.py'),
             ('/django/forms/widgets.py', 'widgets.py')
         ]
@@ -1316,7 +1314,6 @@ class FieldsTests(SimpleTestCase):
             ('/django/forms/forms.py', 'forms.py'),
             ('/django/forms/formsets.py', 'formsets.py'),
             ('/django/forms/models.py', 'models.py'),
-            ('/django/forms/util.py', 'util.py'),
             ('/django/forms/utils.py', 'utils.py'),
             ('/django/forms/widgets.py', 'widgets.py')
         ]