Replaced old-style with new-style decorator syntax.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16138 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/templatetags/admin_list.py

@@ -19,6 +19,7 @@
 
 DOT = '.'
 
+@register.simple_tag
 def paginator_number(cl,i):
     """
     Generates an individual page index link in a paginated list.
@@ -29,8 +30,8 @@ def paginator_number(cl,i):
         return mark_safe(u'<span class="this-page">%d</span> ' % (i+1))
     else:
         return mark_safe(u'<a href="%s"%s>%d</a> ' % (escape(cl.get_query_string({PAGE_VAR: i})), (i == cl.paginator.num_pages-1 and ' class="end"' or ''), i+1))
-paginator_number = register.simple_tag(paginator_number)
 
+@register.inclusion_tag('admin/pagination.html')
 def pagination(cl):
     """
     Generates the series of links to the pages in a paginated list.
@@ -75,7 +76,6 @@ def pagination(cl):
         'ALL_VAR': ALL_VAR,
         '1': 1,
     }
-pagination = register.inclusion_tag('admin/pagination.html')(pagination)
 
 def result_headers(cl):
     """
@@ -123,7 +123,8 @@ def result_headers(cl):
 
 def _boolean_icon(field_val):
     BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
-    return mark_safe(u'<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val))
+    return mark_safe(u'<img src="%simg/admin/icon-%s.gif" alt="%s" />' %
+        (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val))
 
 def items_for_result(cl, result, form):
     """
@@ -222,6 +223,7 @@ def result_hidden_fields(cl):
             if form[cl.model._meta.pk.name].is_hidden:
                 yield mark_safe(force_unicode(form[cl.model._meta.pk.name]))
 
+@register.inclusion_tag("admin/change_list_results.html")
 def result_list(cl):
     """
     Displays the headers and data list together
@@ -230,8 +232,8 @@ def result_list(cl):
             'result_hidden_fields': list(result_hidden_fields(cl)),
             'result_headers': list(result_headers(cl)),
             'results': list(results(cl))}
-result_list = register.inclusion_tag("admin/change_list_results.html")(result_list)
 
+@register.inclusion_tag('admin/date_hierarchy.html')
 def date_hierarchy(cl):
     """
     Displays the date hierarchy for date drill-down functionality.
@@ -303,8 +305,8 @@ def date_hierarchy(cl):
                     'title': str(year.year),
                 } for year in years]
             }
-date_hierarchy = register.inclusion_tag('admin/date_hierarchy.html')(date_hierarchy)
 
+@register.inclusion_tag('admin/search_form.html')
 def search_form(cl):
     """
     Displays a search form for searching the list.
@@ -314,17 +316,16 @@ def search_form(cl):
         'show_result_count': cl.result_count != cl.full_result_count,
         'search_var': SEARCH_VAR
     }
-search_form = register.inclusion_tag('admin/search_form.html')(search_form)
 
+@register.inclusion_tag('admin/filter.html')
 def admin_list_filter(cl, spec):
     return {'title': spec.title(), 'choices' : list(spec.choices(cl))}
-admin_list_filter = register.inclusion_tag('admin/filter.html')(admin_list_filter)
 
+@register.inclusion_tag('admin/actions.html', takes_context=True)
 def admin_actions(context):
     """
     Track the number of times the action field has been rendered on the page,
     so we know which value to use.
     """
     context['action_index'] = context.get('action_index', -1) + 1
     return context
-admin_actions = register.inclusion_tag("admin/actions.html", takes_context=True)(admin_actions)

django/contrib/admin/templatetags/admin_modify.py

@@ -2,6 +2,7 @@
 
 register = template.Library()
 
+@register.inclusion_tag('admin/prepopulated_fields_js.html', takes_context=True)
 def prepopulated_fields_js(context):
     """
     Creates a list of prepopulated_fields that should render Javascript for
@@ -17,8 +18,8 @@ def prepopulated_fields_js(context):
                     prepopulated_fields.extend(inline_admin_form.prepopulated_fields)
     context.update({'prepopulated_fields': prepopulated_fields})
     return context
-prepopulated_fields_js = register.inclusion_tag('admin/prepopulated_fields_js.html', takes_context=True)(prepopulated_fields_js)
 
+@register.inclusion_tag('admin/submit_line.html', takes_context=True)
 def submit_row(context):
     """
     Displays the row of buttons for delete and save.
@@ -39,8 +40,8 @@ def submit_row(context):
         'is_popup': is_popup,
         'show_save': True
     }
-submit_row = register.inclusion_tag('admin/submit_line.html', takes_context=True)(submit_row)
 
+@register.filter
 def cell_count(inline_admin_form):
     """Returns the number of cells used in a tabular inline"""
     count = 1 # Hidden cell with hidden 'id' field
@@ -53,4 +54,3 @@ def cell_count(inline_admin_form):
         # Delete checkbox
         count += 1
     return count
-cell_count = register.filter(cell_count)

django/contrib/admin/templatetags/log.py

@@ -20,7 +20,8 @@ def render(self, context):
             context[self.varname] = LogEntry.objects.filter(user__id__exact=user_id).select_related('content_type', 'user')[:self.limit]
         return ''
 
-class DoGetAdminLog:
+@register.tag
+def get_admin_log(parser, token):
     """
     Populates a template variable with the admin log for the given criteria.
 
@@ -38,20 +39,18 @@ class DoGetAdminLog:
     (user ID) or the name of a template context variable containing the user
     object whose ID you want.
     """
-    def __init__(self, tag_name):
-        self.tag_name = tag_name
-
-    def __call__(self, parser, token):
-        tokens = token.contents.split()
-        if len(tokens) < 4:
-            raise template.TemplateSyntaxError("'%s' statements require two arguments" % self.tag_name)
-        if not tokens[1].isdigit():
-            raise template.TemplateSyntaxError("First argument in '%s' must be an integer" % self.tag_name)
-        if tokens[2] != 'as':
-            raise template.TemplateSyntaxError("Second argument in '%s' must be 'as'" % self.tag_name)
-        if len(tokens) > 4:
-            if tokens[4] != 'for_user':
-                raise template.TemplateSyntaxError("Fourth argument in '%s' must be 'for_user'" % self.tag_name)
-        return AdminLogNode(limit=tokens[1], varname=tokens[3], user=(len(tokens) > 5 and tokens[5] or None))
-
-register.tag('get_admin_log', DoGetAdminLog('get_admin_log'))
+    tokens = token.contents.split()
+    if len(tokens) < 4:
+        raise template.TemplateSyntaxError(
+            "'get_admin_log' statements require two arguments")
+    if not tokens[1].isdigit():
+        raise template.TemplateSyntaxError(
+            "First argument to 'get_admin_log' must be an integer")
+    if tokens[2] != 'as':
+        raise template.TemplateSyntaxError(
+            "Second argument to 'get_admin_log' must be 'as'")
+    if len(tokens) > 4:
+        if tokens[4] != 'for_user':
+            raise template.TemplateSyntaxError(
+                "Fourth argument to 'get_admin_log' must be 'for_user'")
+    return AdminLogNode(limit=tokens[1], varname=tokens[3], user=(len(tokens) > 5 and tokens[5] or None))

django/contrib/admin/views/decorators.py

@@ -9,6 +9,7 @@ def staff_member_required(view_func):
     Decorator for views that checks that the user is logged in and is a staff
     member, displaying the login page if necessary.
     """
+    @wraps(view_func)
     def _checklogin(request, *args, **kwargs):
         if request.user.is_active and request.user.is_staff:
             # The user is valid. Continue to the admin page.
@@ -25,4 +26,4 @@ def _checklogin(request, *args, **kwargs):
             },
         }
         return login(request, **defaults)
-    return wraps(view_func)(_checklogin)
+    return _checklogin

django/contrib/admindocs/views.py

@@ -27,22 +27,23 @@ def get_root_path():
     except urlresolvers.NoReverseMatch:
         return getattr(settings, "ADMIN_SITE_ROOT_URL", "/admin/")
 
+@staff_member_required
 def doc_index(request):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
     return render_to_response('admin_doc/index.html', {
         'root_path': get_root_path(),
     }, context_instance=RequestContext(request))
-doc_index = staff_member_required(doc_index)
 
+@staff_member_required
 def bookmarklets(request):
     admin_root = get_root_path()
     return render_to_response('admin_doc/bookmarklets.html', {
         'root_path': admin_root,
         'admin_url': mark_safe("%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root)),
     }, context_instance=RequestContext(request))
-bookmarklets = staff_member_required(bookmarklets)
 
+@staff_member_required
 def template_tag_index(request):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -76,8 +77,8 @@ def template_tag_index(request):
         'root_path': get_root_path(),
         'tags': tags
     }, context_instance=RequestContext(request))
-template_tag_index = staff_member_required(template_tag_index)
 
+@staff_member_required
 def template_filter_index(request):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -111,8 +112,8 @@ def template_filter_index(request):
         'root_path': get_root_path(),
         'filters': filters
     }, context_instance=RequestContext(request))
-template_filter_index = staff_member_required(template_filter_index)
 
+@staff_member_required
 def view_index(request):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -142,8 +143,8 @@ def view_index(request):
         'root_path': get_root_path(),
         'views': views
     }, context_instance=RequestContext(request))
-view_index = staff_member_required(view_index)
 
+@staff_member_required
 def view_detail(request, view):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -167,8 +168,8 @@ def view_detail(request, view):
         'body': body,
         'meta': metadata,
     }, context_instance=RequestContext(request))
-view_detail = staff_member_required(view_detail)
 
+@staff_member_required
 def model_index(request):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -177,8 +178,8 @@ def model_index(request):
         'root_path': get_root_path(),
         'models': m_list
     }, context_instance=RequestContext(request))
-model_index = staff_member_required(model_index)
 
+@staff_member_required
 def model_detail(request, app_label, model_name):
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
@@ -272,8 +273,8 @@ def model_detail(request, app_label, model_name):
         'description': model.__doc__,
         'fields': fields,
     }, context_instance=RequestContext(request))
-model_detail = staff_member_required(model_detail)
 
+@staff_member_required
 def template_detail(request, template):
     templates = []
     for site_settings_module in settings.ADMIN_FOR:
@@ -297,7 +298,6 @@ def template_detail(request, template):
         'name': template,
         'templates': templates,
     }, context_instance=RequestContext(request))
-template_detail = staff_member_required(template_detail)
 
 ####################
 # Helper functions #