Ticket #3753: 3753-2.diff

django/template/__init__.py

@@ -99 +99 @@
-# global list of libraries to load by default for a new parser
-builtins = []
-
+# a boolean for if TEMPLATE_STRING_IF_INVALID contains a format string (%s)
+invalid_var_format_string = '%s' in settings.TEMPLATE_STRING_IF_INVALID
+
-class TemplateSyntaxError(Exception):
-    def __str__(self):
-        try:
@@ -575 +578 @@
-                obj = None
-            else:
-                if settings.TEMPLATE_STRING_IF_INVALID:
+                    if invalid_var_format_string:
+                        return settings.TEMPLATE_STRING_IF_INVALID % self.var
-                    return settings.TEMPLATE_STRING_IF_INVALID
-                else:
-                    obj = settings.TEMPLATE_STRING_IF_INVALID

tests/regressiontests/templates/tests.py

@@ -586 +586 @@
-            'invalidstr03': ('{% for v in var %}({{ v }}){% endfor %}', {}, ''),
-            'invalidstr04': ('{% if var %}Yes{% else %}No{% endif %}', {}, 'No'),
-            'invalidstr04': ('{% if var|default:"Foo" %}Yes{% else %}No{% endif %}', {}, 'Yes'),
+            'invalidstr05': ('{{ var }}', {}, ('', 'INVALID %s', 'var')),
+            'invalidstr06': ('{{ var.prop }}', {'var': {}}, ('', 'INVALID %s', 'var.prop')),
-
-            ### MULTILINE #############################################################
-
@@ -737 +739 @@
-
-        # Set TEMPLATE_STRING_IF_INVALID to a known string
-        old_invalid = settings.TEMPLATE_STRING_IF_INVALID
+        expected_invalid_str = 'INVALID'
-
-        for name, vals in tests:
-            install()
@@ -744 +747 @@
-            if isinstance(vals[2], tuple):
-                normal_string_result = vals[2][0]
-                invalid_string_result = vals[2][1]
+                if '%s' in invalid_string_result:
+                    expected_invalid_str = 'INVALID %s'
+                    invalid_string_result = invalid_string_result % vals[2][2]
+                    template.invalid_var_format_string = True
-            else:
-                normal_string_result = vals[2]
-                invalid_string_result = vals[2]
@@ -754 +761 @@
-                activate('en-us')
-
-            for invalid_str, result in [('', normal_string_result),
-'INVALID'
+expected_invalid_str
-                settings.TEMPLATE_STRING_IF_INVALID = invalid_str
-                try:
-                    output = loader.get_template(name).render(template.Context(vals[1]))
@@ -768 +775 @@
-            if 'LANGUAGE_CODE' in vals[1]:
-                deactivate()
-
+            if template.invalid_var_format_string:
+                expected_invalid_str = 'INVALID'
+                template.invalid_var_format_string = False
+
-        loader.template_source_loaders = old_template_loaders
-        deactivate()
-        settings.TEMPLATE_DEBUG = old_td

AUTHORS

@@ -145 +145 @@
-    lerouxb@gmail.com
-    Waylan Limberg <waylan@gmail.com>
-    limodou
-mattmcc
+Matt McClanahan <http://mmcc.cx/>
-    Martin Maney <http://www.chipy.org/Martin_Maney>
-    masonsimon+django@gmail.com
-    Manuzhai

docs/templates_python.txt

@@ -212 +212 @@
-tags, the variable will be interpreted as ``None``. Filters are always
-applied to invalid variables within these template tags.
-
+If TEMPLATE_STRING_IF_INVALID contains a ``'%s'``, it will be replaced with
+the name of the invalid variable.
+
-.. admonition:: For debug purposes only!
-
-    While ``TEMPLATE_STRING_IF_INVALID`` can be a useful debugging tool,