Context Navigation

Ticket #15512: 15512_admin_imports_cleanup.diff

File 15512_admin_imports_cleanup.diff, 6.1 KB (added by Julien Phalip, 14 years ago)

diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index a0eda38..2dc9f03 100644

-              a
 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

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 77c7705..ff5939b 100644

-              a
 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

diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index 4b6e3ca..b03bce4 100644

-              a
 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
-…
+               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

diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index bbe4b64..2d4057a 100644

                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

diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index d0a5293..e98ec7b 100644

                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):

diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py
index e0db936..bf2ad27 100644

                from django.db.models.fields import FieldDoesNotExist
 from django.forms.models import (BaseModelForm, BaseModelFormSet, fields_for_model,
     _get_foreign_key)
 from django.contrib.admin.util import get_fields_from_path, NotRelationField
 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
 from django.contrib.admin.options import HORIZONTAL, VERTICAL
+from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin, \
+    HORIZONTAL, VERTICAL
 __all__ = ['validate']

diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index 1f5f20d..9088eb0 100644

                try:
 except ImportError:
     from django.utils.functional import wraps  # Python 2.4 fallback.
-from django import template
-from django.shortcuts import render_to_response
 from django.utils.translation import ugettext as _
 from django.contrib.admin.forms import AdminAuthenticationForm
 from django.contrib.auth.views import login
 from django.contrib.auth import REDIRECT_FIELD_NAME

diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index 635330f..f4dd2fd 100644

                from django.contrib.admin.filterspecs import FilterSpec
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.contrib.admin.util import quote, get_fields_from_path
 from django.core.exceptions import SuspiciousOperation
 from django.core.paginator import Paginator, InvalidPage
+from django.core.paginator import InvalidPage
 from django.db import models
 from django.utils.encoding import force_unicode, smart_str
 from django.utils.translation import ugettext