Fixed #17627 -- Renamed util.py files to utils.py

Thanks PaulM for the suggestion and Luke Granger-Brown and
Wiktor Kołodziej for the initial patch.

13 files changed, 17 insertions, 17 deletions

diff --git a/tests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
index 257638afb1..1dc9da7efd 100644
--- a/tests/admin_custom_urls/tests.py
+++ b/tests/admin_custom_urls/tests.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 import warnings
 
-from django.contrib.admin.util import quote
+from django.contrib.admin.utils import quote
 from django.core.urlresolvers import reverse
 from django.template.response import TemplateResponse
 from django.test import TestCase
diff --git a/tests/admin_util/tests.py b/tests/admin_util/tests.py
index 8c63e90ce1..31bb412af4 100644
--- a/tests/admin_util/tests.py
+++ b/tests/admin_util/tests.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin import helpers
-from django.contrib.admin.util import (display_for_field, flatten_fieldsets,
+from django.contrib.admin.utils import (display_for_field, flatten_fieldsets,
     label_for_field, lookup_field, NestedObjects)
 from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
 from django.contrib.sites.models import Site
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 5649a3c492..8d864378ce 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -768,7 +768,7 @@ site.register(UnchangeableObject, UnchangeableObjectAdmin)
 #     related OneToOne object not registered in admin
 # when deleting Book so as exercise all four troublesome (w.r.t escaping
 # and calling force_text to avoid problems on Python 2.3) paths through
-# contrib.admin.util's get_deleted_objects function.
+# contrib.admin.utils's get_deleted_objects function.
 site.register(Book, inlines=[ChapterInline])
 site.register(Promo)
 site.register(ChapterXtra1, ChapterXtra1Admin)
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 75e8a51acd..4793a27f23 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -15,14 +15,14 @@ from django.contrib.auth import get_permission_codename
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.admin.models import LogEntry, DELETION
 from django.contrib.admin.sites import LOGIN_FORM_KEY
-from django.contrib.admin.util import quote
+from django.contrib.admin.utils import quote
 from django.contrib.admin.views.main import IS_POPUP_VAR
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.models import Group, User, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection
-from django.forms.util import ErrorList
+from django.forms.utils import ErrorList
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.utils import patch_logger
diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index 903aedec20..a6badac9a9 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -15,7 +15,7 @@ from django.db import (connection, connections, DEFAULT_DB_ALIAS,
 from django.db.backends.signals import connection_created
 from django.db.backends.sqlite3.base import DatabaseOperations
 from django.db.backends.postgresql_psycopg2 import version as pg_version
-from django.db.backends.util import format_number
+from django.db.backends.utils import format_number
 from django.db.models import Sum, Avg, Variance, StdDev
 from django.db.models.fields import (AutoField, DateField, DateTimeField,
     DecimalField, IntegerField, TimeField)
diff --git a/tests/db_typecasts/tests.py b/tests/db_typecasts/tests.py
index fc5305dcdd..27b89c0c8c 100644
--- a/tests/db_typecasts/tests.py
+++ b/tests/db_typecasts/tests.py
@@ -3,7 +3,7 @@
 import datetime
 import unittest
 
-from django.db.backends import util as typecasts
+from django.db.backends import utils as typecasts
 from django.utils import six
 
 
diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py
index 2b1bec1647..a884bdc75b 100644
--- a/tests/forms_tests/tests/test_error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
@@ -215,7 +215,7 @@ class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
                 raise ValidationError("I like to be awkward.")
 
         @python_2_unicode_compatible
-        class CustomErrorList(util.ErrorList):
+        class CustomErrorList(utils.ErrorList):
             def __str__(self):
                 return self.as_divs()
 
diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py
index 21186682d5..d0409155dd 100644
--- a/tests/forms_tests/tests/test_extra.py
+++ b/tests/forms_tests/tests/test_extra.py
@@ -5,7 +5,7 @@ import datetime
 
 from django.forms import *
 from django.forms.extras import SelectDateWidget
-from django.forms.util import ErrorList
+from django.forms.utils import ErrorList
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils import six
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index 6f305d78c4..990aa9d1f9 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -1142,7 +1142,7 @@ 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')
             ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
@@ -1162,7 +1162,7 @@ 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')
             ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
@@ -1182,7 +1182,7 @@ 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')
             ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
index bd34babef6..12d68283cb 100644
--- a/tests/forms_tests/tests/test_formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -6,7 +6,7 @@ import datetime
 from django.forms import (CharField, DateField, FileField, Form, IntegerField,
     SplitDateTimeField, ValidationError, formsets)
 from django.forms.formsets import BaseFormSet, formset_factory
-from django.forms.util import ErrorList
+from django.forms.utils import ErrorList
 from django.test import TestCase
 
 
diff --git a/tests/forms_tests/tests/test_util.py b/tests/forms_tests/tests/test_util.py
index c2d213ae23..87f9f0d048 100644
--- a/tests/forms_tests/tests/test_util.py
+++ b/tests/forms_tests/tests/test_util.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.core.exceptions import ValidationError
-from django.forms.util import flatatt, ErrorDict, ErrorList
+from django.forms.utils import flatatt, ErrorDict, ErrorList
 from django.test import TestCase
 from django.utils.safestring import mark_safe
 from django.utils import six
@@ -11,7 +11,7 @@ from django.utils.encoding import python_2_unicode_compatible
 
 
 class FormsUtilTestCase(TestCase):
-        # Tests for forms/util.py module.
+    # Tests for forms/utils.py module.
 
     def test_flatatt(self):
         ###########
diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py
index 782c7d6fbc..6715b5b10e 100644
--- a/tests/model_formsets_regress/tests.py
+++ b/tests/model_formsets_regress/tests.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django import forms
 from django.forms.formsets import BaseFormSet, DELETION_FIELD_NAME
-from django.forms.util import ErrorDict, ErrorList
+from django.forms.utils import ErrorDict, ErrorList
 from django.forms.models import modelform_factory, inlineformset_factory, modelformset_factory, BaseModelFormSet
 from django.test import TestCase
 from django.utils import six
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index f9cb132225..988996c9f1 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -382,7 +382,7 @@ class ProxyModelAdminTests(TestCase):
         base_user = BaseUser.objects.all()[0]
         issue = Issue.objects.all()[0]
         with self.assertNumQueries(7):
-            collector = admin.util.NestedObjects('default')
+            collector = admin.utils.NestedObjects('default')
             collector.collect(ProxyTrackerUser.objects.all())
         self.assertTrue(tracker_user in collector.edges.get(None, ()))
         self.assertTrue(base_user in collector.edges.get(None, ()))