Ticket #4552: for_tag_tidy.patch

django/template/defaulttags.py

@@ -5 +5 @@
 from django.template import get_library, Library, InvalidTemplateLibrary
 from django.conf import settings
 import sys
+from itertools import izip
 import re
 
 if not hasattr(__builtins__, 'reversed'):
@@ -127 +128 @@
                 'parentloop': parentloop,
             }
             if unpack:
-                # If there are multiple loop variables, unpack the item into them.
-                context.update(dict(zip(self.loopvars, item)))
+                # If there are multiple loop variables, unpack the item into the
+                # current context scope.
+                for key, value in izip(self.loopvars, item):
+                    context[key] = value
+                # Remove any unused loopvars from the current context scope
+                # which could have been left around from the last loop.
+                for key in self.loopvars[len(item):]:
+                    try:
+                        del context[key]
+                    except:
+                        pass
             else:
                 context[self.loopvars[0]] = item
             for node in self.nodelist_loop:
                 nodelist.append(node.render(context))
-            if unpack:
-                # The loop variables were pushed on to the context so pop them
-                # off again. This is necessary because the tag lets the length
-                # of loopvars differ to the length of each set of items and we
-                # don't want to leave any vars from the previous loop on the
-                # context.
-                context.pop()
         context.pop()
         return nodelist.render(context)
 
@@ -583 +586 @@
     if bits[in_index] != 'in':
         raise TemplateSyntaxError, "'for' statements should use the format 'for x in y': %s" % token.contents
 
-    loopvars = re.sub(r' *, *', ',', ' '.join(bits[1:in_index])).split(',')
+    loopvars = re.split(r' *, *', ' '.join(bits[1:in_index]))
     for var in loopvars:
         if not var or ' ' in var:
             raise TemplateSyntaxError, "'for' tag received an invalid argument: %s" % token.contents