Fixed #15512 -- Cleanup of imports in contrib.admin. Thanks to Julien Phalip for the patch. (49cfe253) · Commits · Dom Sekotill / django

django/contrib/admin/helpers.py

+2 −2

Original line number	Diff line number	Diff line
		from django import forms
		from django.conf import settings
		from django.contrib.admin.util import flatten_fieldsets, lookup_field
		from django.contrib.admin.util import display_for_field, label_for_field, help_text_for_field
		from django.contrib.admin.util import (flatten_fieldsets, lookup_field,
		display_for_field, label_for_field, help_text_for_field)
		from django.contrib.contenttypes.models import ContentType
		from django.core.exceptions import ObjectDoesNotExist
		from django.db.models.fields.related import ManyToManyRel

+3 −4

Original line number	Diff line number	Diff line
		from django import forms, template
		from django.forms.formsets import all_valid
		from django.forms.models import modelform_factory, modelformset_factory, inlineformset_factory
		from django.forms.models import BaseInlineFormSet
		from django.forms.models import (modelform_factory, modelformset_factory,
		inlineformset_factory, BaseInlineFormSet)
		from django.contrib.contenttypes.models import ContentType
		from django.contrib.admin import widgets
		from django.contrib.admin import helpers
		from django.contrib.admin import widgets, helpers
		from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_format_dict
		from django.contrib import messages
		from django.views.decorators.csrf import csrf_protect

+3 −3

Original line number	Diff line number	Diff line
		import re
		from django import http, template
		from django.contrib.admin import ModelAdmin, actions
		from django.contrib.admin.forms import AdminAuthenticationForm, ERROR_MESSAGE
		from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
		from django.contrib.admin.forms import AdminAuthenticationForm
		from django.contrib.auth import REDIRECT_FIELD_NAME
		from django.contrib.contenttypes import views as contenttype_views
		from django.views.decorators.csrf import csrf_protect
		from django.db.models.base import ModelBase
		@@ -12,7 +12,7 @@ from django.shortcuts import render_to_response
		from django.utils.functional import update_wrapper
		from django.utils.safestring import mark_safe
		from django.utils.text import capfirst
		from django.utils.translation import ugettext_lazy, ugettext as _
		from django.utils.translation import ugettext as _
		from django.views.decorators.cache import never_cache
		from django.conf import settings

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@ import datetime

		from django.conf import settings
		from django.contrib.admin.util import lookup_field, display_for_field, label_for_field
		from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE
		from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
		from django.contrib.admin.views.main import (ALL_VAR, EMPTY_CHANGELIST_VALUE,
		ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR)
		from django.core.exceptions import ObjectDoesNotExist
		from django.db import models
		from django.utils import formats

+1 −2

Original line number	Diff line number	Diff line
		@@ -9,8 +9,7 @@ from django.utils.safestring import mark_safe
		from django.utils.text import capfirst
		from django.utils.encoding import force_unicode, smart_unicode, smart_str
		from django.utils.translation import ungettext
		from django.core.urlresolvers import reverse, NoReverseMatch
		from django.utils.datastructures import SortedDict
		from django.core.urlresolvers import reverse


		def quote(s):