From 603d5cc05a742ec25bd1863954afac58c6679580 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 31 May 2007 15:32:37 +0000 Subject: [PATCH] Fixed #4441 -- Made a small optimization to the regroup template tag implementation. Thanks, ferringb@gmail.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@5392 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaulttags.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 1ebb01442e..371b57e430 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -237,7 +237,7 @@ class RegroupNode(Node): return '' output = [] # list of dictionaries in the format {'grouper': 'key', 'list': [list of contents]} for obj in obj_list: - grouper = self.expression.resolve(Context({'var': obj}), True) + grouper = self.expression.resolve(obj, True) # TODO: Is this a sensible way to determine equality? if output and repr(output[-1]['grouper']) == repr(grouper): output[-1]['list'].append(obj) @@ -847,7 +847,7 @@ def regroup(parser, token): if lastbits_reversed[1][::-1] != 'as': raise TemplateSyntaxError, "next-to-last argument to 'regroup' tag must be 'as'" - expression = parser.compile_filter('var.%s' % lastbits_reversed[2][::-1]) + expression = parser.compile_filter(lastbits_reversed[2][::-1]) var_name = lastbits_reversed[0][::-1] return RegroupNode(target, expression, var_name)