Ticket #6766: template_invalid__loop.diff

tests/regressiontests/templates/tests.py

@@ -759 +759 @@
 
             'invalidstr01': ('{{ var|default:"Foo" }}', {}, ('Foo','INVALID')),
             'invalidstr02': ('{{ var|default_if_none:"Foo" }}', {}, ('','INVALID')),
-            'invalidstr03': ('{% for v in var %}({{ v }}){% endfor %}', {}, ''),
+            'invalidstr03': ('{% for v in var %}({{ v }}){% endfor %}', {}, ('', 'INVALID')),
             'invalidstr04': ('{% if var %}Yes{% else %}No{% endif %}', {}, 'No'),
             'invalidstr04': ('{% if var|default:"Foo" %}Yes{% else %}No{% endif %}', {}, 'Yes'),
             'invalidstr05': ('{{ var }}', {}, ('', 'INVALID %s', 'var')),

django/template/__init__.py

@@ -510 +510 @@
         self.filters = filters
         self.var = Variable(var)
 
-    def resolve(self, context, ignore_failures=False):
+    def resolve(self, context, ignore_failures=False, raise_failures=False):
         try:
             obj = self.var.resolve(context)
         except VariableDoesNotExist:
             if ignore_failures:
                 obj = None
+            elif raise_failures:
+                raise
             else:
                 if settings.TEMPLATE_STRING_IF_INVALID:
                     global invalid_var_format_string

django/template/defaulttags.py

@@ -114 +114 @@
             parentloop = {}
         context.push()
         try:
-            values = self.sequence.resolve(context, True)
+            values = self.sequence.resolve(context, raise_failures=True)
         except VariableDoesNotExist:
+            if settings.TEMPLATE_STRING_IF_INVALID:
+                return settings.TEMPLATE_STRING_IF_INVALID % self.sequence
             values = []
         if values is None:
             values = []