Fixed #17627 -- Renamed util.py files to utils.py (18ffdb17) · Commits · Dom Sekotill / django

AUTHORS

+2 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,7 @@ answer newbie questions, and generally made Django that much better:
		David Gouldin <dgouldin@gmail.com>
		pradeep.gowda@gmail.com
		Collin Grady <collin@collingrady.com>
		Luke Granger-Brown <django@lukegb.com>
		Gabriel Grant <g@briel.ca>
		Martin Green
		Daniel Greenfeld
		@@ -348,6 +349,7 @@ answer newbie questions, and generally made Django that much better:
		Cameron Knight (ckknight)
		Nena Kojadin <nena@kiberpipa.org>
		Igor Kolar <ike@email.si>
		Wiktor Kołodziej
		Tomáš Kopeček <permonik@m6.cz>
		Gasper Koren
		Mikhail Korobov <kmike84@googlemail.com>

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Built-in, globally-available admin actions.
		from django.core.exceptions import PermissionDenied
		from django.contrib import messages
		from django.contrib.admin import helpers
		from django.contrib.admin.util import get_deleted_objects, model_ngettext
		from django.contrib.admin.utils import get_deleted_objects, model_ngettext
		from django.db import router
		from django.template.response import TemplateResponse
		from django.utils.encoding import force_text

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured, ValidationError
		from django.utils.encoding import smart_text, force_text
		from django.utils.translation import ugettext_lazy as _
		from django.utils import timezone
		from django.contrib.admin.util import (get_model_from_relation,
		from django.contrib.admin.utils import (get_model_from_relation,
		reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value)
		from django.contrib.admin.options import IncorrectLookupParameters

+3 −3

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		from django import forms
		from django.contrib.admin.util import (flatten_fieldsets, lookup_field,
		from django.contrib.admin.utils import (flatten_fieldsets, lookup_field,
		display_for_field, label_for_field, help_text_for_field)
		from django.contrib.admin.templatetags.admin_static import static
		from django.contrib.contenttypes.models import ContentType
		from django.core.exceptions import ObjectDoesNotExist
		from django.db.models.fields.related import ManyToManyRel
		from django.forms.util import flatatt
		from django.forms.utils import flatatt
		from django.template.defaultfilters import capfirst
		from django.utils.encoding import force_text, smart_text
		from django.utils.html import conditional_escape, format_html
		@@ -308,7 +308,7 @@ class InlineFieldset(Fieldset):
		yield Fieldline(self.form, field, self.readonly_fields,
		model_admin=self.model_admin)

		class AdminErrorList(forms.util.ErrorList):
		class AdminErrorList(forms.utils.ErrorList):
		"""
		Stores all errors for the form/formsets in an add/change stage view.
		"""

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ from __future__ import unicode_literals
		from django.db import models
		from django.conf import settings
		from django.contrib.contenttypes.models import ContentType
		from django.contrib.admin.util import quote
		from django.contrib.admin.utils import quote
		from django.core.urlresolvers import reverse, NoReverseMatch
		from django.utils.translation import ugettext, ugettext_lazy as _
		from django.utils.encoding import smart_text