Ticket #7730: unused_code_nfa.diff

django/contrib/admin/options.py

@@ -1 @@
-from django import oldforms, template
+from django import template
 from django import newforms as forms
 from django.newforms.formsets import all_valid
 from django.newforms.models import modelform_factory, inlineformset_factory
@@ -257 +257 @@
         # Check that LogEntry, ContentType and the auth context processor are installed.
         from django.conf import settings
         if settings.DEBUG:
-            from django.contrib.contenttypes.models import ContentType
             from django.contrib.admin.models import LogEntry
             if not LogEntry._meta.installed:
                 raise ImproperlyConfigured("Put 'django.contrib.admin' in your INSTALLED_APPS setting in order to use the admin application.")
@@ -492 +491 @@
         "The 'add' admin view for this model."
         model = self.model
         opts = model._meta
-        app_label = opts.app_label
 
         if not self.has_add_permission(request):
             raise PermissionDenied
 
-        if self.has_change_permission(request, None):
-            # redirect to list view
-            post_url = '../'
-        else:
-            # Object list will give 'Permission Denied', so go back to admin home
-            post_url = '../../../'
-
         ModelForm = self.get_form(request)
         inline_formsets = []
         obj = self.model()
@@ -549 +540 @@
         "The 'change' admin view for this model."
         model = self.model
         opts = model._meta
-        app_label = opts.app_label
 
         try:
             obj = model._default_manager.get(pk=object_id)

django/contrib/admin/views/main.py

@@ -5 +5 @@
 from django.db.models.query import QuerySet
 from django.utils.encoding import force_unicode, smart_str
 from django.utils.translation import ugettext
-from django.utils.safestring import mark_safe
 from django.utils.http import urlencode
 import operator
 

django/contrib/admin/widgets.py

@@ -7 +7 @@
 from django import newforms as forms
 from django.newforms.widgets import RadioFieldRenderer
 from django.newforms.util import flatatt
-from django.utils.datastructures import MultiValueDict
-from django.utils.text import capfirst, truncate_words
+from django.utils.text import truncate_words
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.encoding import force_unicode
@@ -27 +26 @@
         super(FilteredSelectMultiple, self).__init__(attrs, choices)
 
     def render(self, name, value, attrs=None, choices=()):
-        from django.conf import settings
         output = [super(FilteredSelectMultiple, self).render(name, value, attrs, choices)]
         output.append(u'<script type="text/javascript">addEvent(window, "load", function(e) {')
         # TODO: "id_" is hard-coded here. This should instead use the correct
@@ -103 +101 @@
         super(ForeignKeyRawIdWidget, self).__init__(attrs)
 
     def render(self, name, value, attrs=None):
-        from django.conf import settings
         related_url = '../../../%s/%s/' % (self.rel.to._meta.app_label, self.rel.to._meta.object_name.lower())
         if self.rel.limit_choices_to:
             url = '?' + '&amp;'.join(['%s=%s' % (k, v) for k, v in self.rel.limit_choices_to.items()])