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.

6 files changed, 5 insertions, 5 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 80550c232b..d90b8dbb51 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -14,7 +14,7 @@ from io import BytesIO
 
 from django.core import validators
 from django.core.exceptions import ValidationError
-from django.forms.util import ErrorList, from_current_timezone, to_current_timezone
+from django.forms.utils import ErrorList, from_current_timezone, to_current_timezone
 from django.forms.widgets import (
     TextInput, NumberInput, EmailInput, URLInput, HiddenInput,
     MultipleHiddenInput, ClearableFileInput, CheckboxInput, Select,
diff --git a/django/forms/forms.py b/django/forms/forms.py
index e04d6a0781..64d1550066 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -10,7 +10,7 @@ import warnings
 
 from django.core.exceptions import ValidationError
 from django.forms.fields import Field, FileField
-from django.forms.util import flatatt, ErrorDict, ErrorList
+from django.forms.utils import flatatt, ErrorDict, ErrorList
 from django.forms.widgets import Media, media_property, TextInput, Textarea
 from django.utils.html import conditional_escape, format_html
 from django.utils.encoding import smart_text, force_text, python_2_unicode_compatible
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 02b07a8604..59bfe33a63 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.core.exceptions import ValidationError
 from django.forms import Form
 from django.forms.fields import IntegerField, BooleanField
-from django.forms.util import ErrorList
+from django.forms.utils import ErrorList
 from django.forms.widgets import HiddenInput
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
diff --git a/django/forms/models.py b/django/forms/models.py
index f292606862..c05c452383 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -12,7 +12,7 @@ from django.core.exceptions import ValidationError, NON_FIELD_ERRORS, FieldError
 from django.forms.fields import Field, ChoiceField
 from django.forms.forms import BaseForm, get_declared_fields
 from django.forms.formsets import BaseFormSet, formset_factory
-from django.forms.util import ErrorList
+from django.forms.utils import ErrorList
 from django.forms.widgets import (SelectMultiple, HiddenInput,
     MultipleHiddenInput, media_property, CheckboxSelectMultiple)
 from django.utils.encoding import smart_text, force_text
diff --git a/django/forms/util.py b/django/forms/utils.py
index bb5bb8c2e4..bb5bb8c2e4 100644
--- a/django/forms/util.py
+++ b/django/forms/utils.py
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index ea701bdcf9..372c0f440b 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -9,7 +9,7 @@ from itertools import chain
 import warnings
 
 from django.conf import settings
-from django.forms.util import flatatt, to_current_timezone
+from django.forms.utils import flatatt, to_current_timezone
 from django.utils.datastructures import MultiValueDict, MergeDict
 from django.utils.html import conditional_escape, format_html
 from django.utils.translation import ugettext_lazy