Ticket #15512: 15512_admin_imports_cleanup.diff

File 15512_admin_imports_cleanup.diff, 6.1 KB (added by Julien Phalip, 14 years ago)
  • django/contrib/admin/helpers.py

    diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
    index a0eda38..2dc9f03 100644
    a b  
    11from django import forms
    22from django.conf import settings
    3 from django.contrib.admin.util import flatten_fieldsets, lookup_field
    4 from django.contrib.admin.util import display_for_field, label_for_field, help_text_for_field
     3from django.contrib.admin.util import flatten_fieldsets, lookup_field, \
     4    display_for_field, label_for_field, help_text_for_field
    55from django.contrib.contenttypes.models import ContentType
    66from django.core.exceptions import ObjectDoesNotExist
    77from django.db.models.fields.related import ManyToManyRel
  • django/contrib/admin/options.py

    diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
    index 77c7705..ff5939b 100644
    a b  
    11from django import forms, template
    22from django.forms.formsets import all_valid
    3 from django.forms.models import modelform_factory, modelformset_factory, inlineformset_factory
    4 from django.forms.models import BaseInlineFormSet
     3from django.forms.models import modelform_factory, modelformset_factory, \
     4    inlineformset_factory, BaseInlineFormSet
    55from django.contrib.contenttypes.models import ContentType
    6 from django.contrib.admin import widgets
    7 from django.contrib.admin import helpers
     6from django.contrib.admin import widgets, helpers
    87from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_format_dict
    98from django.contrib import messages
    109from django.views.decorators.csrf import csrf_protect
  • django/contrib/admin/sites.py

    diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
    index 4b6e3ca..b03bce4 100644
    a b  
    11import re
    22from django import http, template
    33from django.contrib.admin import ModelAdmin, actions
    4 from django.contrib.admin.forms import AdminAuthenticationForm, ERROR_MESSAGE
    5 from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
     4from django.contrib.admin.forms import AdminAuthenticationForm
     5from django.contrib.auth import REDIRECT_FIELD_NAME
    66from django.contrib.contenttypes import views as contenttype_views
    77from django.views.decorators.csrf import csrf_protect
    88from django.db.models.base import ModelBase
    from django.shortcuts import render_to_response  
    1212from django.utils.functional import update_wrapper
    1313from django.utils.safestring import mark_safe
    1414from django.utils.text import capfirst
    15 from django.utils.translation import ugettext_lazy, ugettext as _
     15from django.utils.translation import ugettext as _
    1616from django.views.decorators.cache import never_cache
    1717from django.conf import settings
    1818
  • django/contrib/admin/templatetags/admin_list.py

    diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
    index bbe4b64..2d4057a 100644
    a b import datetime  
    22
    33from django.conf import settings
    44from django.contrib.admin.util import lookup_field, display_for_field, label_for_field
    5 from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE
    6 from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
     5from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE, \
     6    ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
    77from django.core.exceptions import ObjectDoesNotExist
    88from django.db import models
    99from django.utils import formats
  • django/contrib/admin/util.py

    diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
    index d0a5293..e98ec7b 100644
    a b from django.utils.safestring import mark_safe  
    99from django.utils.text import capfirst
    1010from django.utils.encoding import force_unicode, smart_unicode, smart_str
    1111from django.utils.translation import ungettext
    12 from django.core.urlresolvers import reverse, NoReverseMatch
    13 from django.utils.datastructures import SortedDict
     12from django.core.urlresolvers import reverse
    1413
    1514
    1615def quote(s):
  • django/contrib/admin/validation.py

    diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py
    index e0db936..bf2ad27 100644
    a b from django.db.models.fields import FieldDoesNotExist  
    44from django.forms.models import (BaseModelForm, BaseModelFormSet, fields_for_model,
    55    _get_foreign_key)
    66from django.contrib.admin.util import get_fields_from_path, NotRelationField
    7 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
    8 from django.contrib.admin.options import HORIZONTAL, VERTICAL
     7from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin, \
     8    HORIZONTAL, VERTICAL
    99
    1010
    1111__all__ = ['validate']
  • django/contrib/admin/views/decorators.py

    diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
    index 1f5f20d..9088eb0 100644
    a b try:  
    33except ImportError:
    44    from django.utils.functional import wraps  # Python 2.4 fallback.
    55
    6 from django import template
    7 from django.shortcuts import render_to_response
    86from django.utils.translation import ugettext as _
    9 
    107from django.contrib.admin.forms import AdminAuthenticationForm
    118from django.contrib.auth.views import login
    129from django.contrib.auth import REDIRECT_FIELD_NAME
  • django/contrib/admin/views/main.py

    diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
    index 635330f..f4dd2fd 100644
    a b from django.contrib.admin.filterspecs import FilterSpec  
    22from django.contrib.admin.options import IncorrectLookupParameters
    33from django.contrib.admin.util import quote, get_fields_from_path
    44from django.core.exceptions import SuspiciousOperation
    5 from django.core.paginator import Paginator, InvalidPage
     5from django.core.paginator import InvalidPage
    66from django.db import models
    77from django.utils.encoding import force_unicode, smart_str
    88from django.utils.translation import ugettext
Back to Top