Ticket #6378: 6378-into.diff

django/template/defaulttags.py

@@ -416 +416 @@
         return str(int(round(ratio)))
 
 class WithNode(Node):
-    def __init__(self, var, name, nodelist):
+    def __init__(self, var, name, nodelist, into):
         self.var = var
         self.name = name
         self.nodelist = nodelist
+        self.into = into
 
     def __repr__(self):
         return "<WithNode>"
@@ -430 +431 @@
         context[self.name] = val
         output = self.nodelist.render(context)
         context.pop()
-        return output
+        if not self.into:
+            return output
+        else:
+            context[self.into] = output
+            return ''
 
 #@register.tag
 def autoescape(parser, token):
@@ -1160 +1165 @@
         {% with person.some_sql_method as total %}
             {{ total }} object{{ total|pluralize }}
         {% endwith %}
+
+        {% with person.some_sql_method as total into content %}
+            {{ total }} object{{ total|pluralize }}
+        {% endwith %}
+        {{ content }}
+
     """
     bits = list(token.split_contents())
-    if len(bits) != 4 or bits[2] != "as":
-        raise TemplateSyntaxError("%r expected format is 'value as name'" %
+    if len(bits) == 4:
+        if bits[2] != "as":
+            raise TemplateSyntaxError("%r expected format is 'value as name [into context]'" %
                                   bits[0])
+    elif len(bits) == 6:
+        if bits[2] != "as" or bits[4] != "into":
+            raise TemplateSyntaxError("%r expected format is 'value as name [into context]'" %
+                                  bits[0])
+    else:
+        raise TemplateSyntaxError("%r expected format is 'value as name [into context]'" %
+                                  bits[0])
+
     var = parser.compile_filter(bits[1])
     name = bits[3]
     nodelist = parser.parse(('endwith',))
     parser.delete_first_token()
-    return WithNode(var, name, nodelist)
+    if len(bits) == 4:
+        return WithNode(var, name, nodelist, '')
+    elif len(bits) == 6:
+        into = bits[5]
+        return WithNode(var, name, nodelist, into)
+
 do_with = register.tag('with', do_with)

tests/regressiontests/templates/tests.py

@@ -891 +891 @@
             ### WITH TAG ########################################################
             'with01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key':50}}, '50'),
             'with02': ('{{ key }}{% with dict.key as key %}{{ key }}-{{ dict.key }}-{{ key }}{% endwith %}{{ key }}', {'dict': {'key':50}}, ('50-50-50', 'INVALID50-50-50INVALID')),
+            'with03': ('{% with dict.key as key into content %}{{ key }}{% endwith %}{{ content }}', {'dict': {'key': 50}}, '50'),
+            'with04': ('{{ content }}-{% with dict.key as key into content %}{{ key }}{% endwith %}-{{ content }}', {'dict': {'key': 50}}, '--50'),
 
             'with-error01': ('{% with dict.key xx key %}{{ key }}{% endwith %}', {'dict': {'key':50}}, template.TemplateSyntaxError),
             'with-error02': ('{% with dict.key as %}{{ key }}{% endwith %}', {'dict': {'key':50}}, template.TemplateSyntaxError),
+            'with-error03': ('{% with dict.key as key into %}{{ key }}{% endwith %}', {'dict': {'key':50}}, template.TemplateSyntaxError),
+            'with-error04': ('{% with dict.key as key blah content %}{{ key }}{% endwith %}', {'dict': {'key':50}}, template.TemplateSyntaxError),
 
             ### NOW TAG ########################################################
             # Simple case