Changeset 6729

Timestamp:

11/28/07 19:44:30 (1 year ago)

Author:

mtredinnick

Message:

Added tests and a small optimisation for [6721]. Thanks SmileyChris?. Fixed #6049

Files:

• django/trunk/django/template/defaultfilters.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/filters.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/defaultfilters.py

@@ -26 +26 @@
-            args = list(args)
-            args[0] = force_unicode(args[0])
-
-
+    
+    
-        return func(*args, **kwargs)
-

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

@@ -12 +12 @@
-from django.utils.tzinfo import LocalTimezone
-from django.utils.safestring import mark_safe
+
+# These two classes are used to test auto-escaping of __unicode__ output.
+class UnsafeClass:
+    def __unicode__(self):
+        return u'you & me'
+
+class SafeClass:
+    def __unicode__(self):
+        return mark_safe(u'you > me')
-
-# RESULT SYNTAX --
@@ -228 +237 @@
-        'chaining13': ('{{ a|safe|force_escape }}', {"a": "a < b"}, "a &lt; b"),
-        'chaining14': ('{% autoescape off %}{{ a|safe|force_escape }}{% endautoescape %}', {"a": "a < b"}, "a &lt; b"),
+
+        # Filters decorated with stringfilter still respect is_safe. 
+        'autoescape-stringfilter01': (r'{{ unsafe|capfirst }}', {'unsafe': UnsafeClass()}, 'You &amp; me'),
+        'autoescape-stringfilter02': (r'{% autoescape off %}{{ unsafe|capfirst }}{% endautoescape %}', {'unsafe': UnsafeClass()}, 'You & me'),
+        'autoescape-stringfilter03': (r'{{ safe|capfirst }}', {'safe': SafeClass()}, 'You &gt; me'),
+        'autoescape-stringfilter04': (r'{% autoescape off %}{{ safe|capfirst }}{% endautoescape %}', {'safe': SafeClass()}, 'You &gt; me'),
-    }
+

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

@@ -900 +900 @@
-            # Literal string arguments to filters, if used in the result, are
-            # safe.
-
+
+
+
+
+
+
-
-            # The "safe" and "escape" filters cannot work due to internal