summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-18 11:42:08 -0500
committerTim Graham <timograham@gmail.com>2015-01-17 07:40:12 -0500
commit9ce36512fa925231b0496cc10f7d114c069c7c06 (patch)
treed553b6914e3d10e2461977493b567bf29877e44f
parentd79a30ba3f991bc3150fa1260fab1c10f5d3450a (diff)
Removed backwards compatibility shims for "util" modules per deprecation timeline.
refs #17627.
-rw-r--r--django/contrib/admin/util.py9
-rw-r--r--django/contrib/gis/db/backends/util.py10
-rw-r--r--django/db/backends/util.py10
-rw-r--r--django/forms/util.py9
-rw-r--r--tests/forms_tests/tests/test_fields.py3
5 files changed, 0 insertions, 41 deletions
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
deleted file mode 100644
index 416b75e7b2..0000000000
--- 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 08f1ca8d80..0000000000
--- 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 5797830974..0000000000
--- 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 e093068275..0000000000
--- 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 ea6e842475..d04001b6b2 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')
]