magic-removal: Tiny refactoring/reformatting of admin code

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1829 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/templates/admin/change_form.html

@@ -9,8 +9,8 @@
 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
-	 {% path_breadcrumbs path "Home" "1" "1" %}
-     {% if add %}{% trans "Add" %} {{ bound_manipulator.verbose_name }}{% else %}{{ bound_manipulator.original|striptags|truncatewords:"18" }}{% endif %}
+  {% path_breadcrumbs path "Home" "1" "1" %}
+  {% if add %}{% trans "Add" %} {{ bound_manipulator.verbose_name }}{% else %}{{ bound_manipulator.original|striptags|truncatewords:"18" }}{% endif %}
 </div>
 {% endif %}{% endblock %}
 {% block content %}<div id="content-main">

django/contrib/admin/templatetags/breadcrumbs.py

@@ -10,7 +10,7 @@ def path_breadcrumbs(path, overrides="", front=0, back=0):
     text = []
     for comp, ov in zip(comps, overs):
         label = ov or comp
-        text.append("<a href='%s'>%s</a>&rsaquo;\n" % ("../" * backs, label))
+        text.append("<a href='%s'>%s</a> &rsaquo; \n" % ("../" * backs, label))
         backs -= 1
     return "".join(text)
 path_breadcrumbs = register.simple_tag(path_breadcrumbs)

django/contrib/admin/views/main.py

@@ -58,18 +58,17 @@ def find_model(mod, remaining):
 
 def get_app_label(mod):
     #HACK
-    modcomps = mod.__name__.split('.')
-    return modcomps[-2]
+    return mod.__name__.split('.')[-2]
 
 def get_model_and_app(path):
     comps = path.split('/')
     comps = comps[:-1] # remove '' after final /
     for mod in models.get_installed_models():
-        remaining, matched =  matches_app(mod, comps)
+        remaining, matched = matches_app(mod, comps)
         if matched and len(remaining) > 0:
            # print "matched ", mod
            # print "left", remaining
-            return ( find_model(mod, remaining), get_app_label(mod) )
+            return (find_model(mod, remaining), get_app_label(mod))
 
     raise Http404 # Couldn't find app
 
@@ -83,11 +82,11 @@ def url_for_model(model):
         for mod in models.get_installed_models():
             remaining, matched =  matches_app(mod, comps)
             if matched and len(remaining) > 0:
-                comps = comps[: - len(remaining)] + remaining[1:]
-                url = "%s%s/%s/" % (ADMIN_PREFIX, '/'.join(comps) , model.__name__.lower() )
+                comps = comps[:-len(remaining)] + remaining[1:]
+                url = "%s%s/%s/" % (ADMIN_PREFIX, '/'.join(comps) , model.__name__.lower())
                 _model_urls[model] = url
                 return url
-        raise ImproperlyConfigured('%s is not a model in an installed app' % model.__name__ )
+        raise ImproperlyConfigured, '%s is not a model in an installed app' % model.__name__
 
 def index(request):
     return render_to_response('admin/index', {'title': _('Site administration')}, context_instance=Context(request))

django/contrib/admin/views/stages/add.py

@@ -3,6 +3,7 @@ from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.admin.views.main import get_model_and_app
 from django.contrib.admin.views.stages.modify import render_change_form
 from django.core import formfields, template
+from django.core.exceptions import Http404, ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
 from django.core.extensions import DjangoContext as Context
 from django.db import models
 from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect

django/contrib/admin/views/stages/change.py

@@ -1,5 +1,6 @@
 from django.contrib.admin.views.main import get_model_and_app
 from django.core import formfields, template
+from django.core.exceptions import Http404, ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
 from django.core.extensions import DjangoContext as Context
 from django.contrib.admin.views.stages.modify import render_change_form
 from django.db import models
@@ -11,8 +12,6 @@ try:
 except ImportError:
     raise ImproperlyConfigured, "You don't have 'django.contrib.admin' in INSTALLED_APPS."
 
-from django.core.exceptions import Http404, ImproperlyConfigured, ObjectDoesNotExist
-
 def log_change_message(user, opts, manipulator, new_object):
     pk_value = getattr(new_object, opts.pk.column)
     # Construct the change message.