Changeset 5167

Timestamp:

05/07/07 22:36:16 (1 year ago)

Author:

mtredinnick

Message:

Fixed #3753 -- Allow optional display of invalid variable name in
TEMPLATE_STRING_IF_INVALID. Thanks, Matt McClanahan?.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/template/__init__.py (modified) (2 diffs)
• django/trunk/docs/templates_python.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (5 diffs)

django/trunk/AUTHORS

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

django/trunk/django/template/__init__.py

@@ -99 +99 @@
-# global list of libraries to load by default for a new parser
-builtins = []
+
+# True if TEMPLATE_STRING_IF_INVALID contains a format string (%s). None means
+# uninitialised.
+invalid_var_format_string = None
-
-class TemplateSyntaxError(Exception):
@@ -576 +580 @@
-            else:
-                if settings.TEMPLATE_STRING_IF_INVALID:
+                    global invalid_var_format_string
+                    if invalid_var_format_string is None:
+                        invalid_var_format_string = '%s' in 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:

django/trunk/docs/templates_python.txt

@@ -213 +213 @@
-applied to invalid variables within these template tags.
-
+If ``TEMPLATE_STRING_IF_INVALID`` contains a ``'%s'``, the format marker will
+be replaced with the name of the invalid variable.
+
-.. admonition:: For debug purposes only!
-
- 
- 
+
+
-    
- 
- 
+
+
-    encountered. If you assign a value other than ``''`` to
- 
+
-    problems with these templates and sites.
-    
- 
- 
+
+
-    once debugging is complete.
-
+
-Playing with Context objects
-----------------------------

django/trunk/tests/regressiontests/templates/tests.py

@@ -587 +587 @@
-            '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 #############################################################
@@ -738 +740 @@
-        # 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:
@@ -745 +748 @@
-                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]
@@ -755 +762 @@
-
-            for invalid_str, result in [('', normal_string_result),
-'INVALID'
+expected_invalid_str
-                settings.TEMPLATE_STRING_IF_INVALID = invalid_str
-                try:
@@ -769 +776 @@
-                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()