Context Navigation

Ticket #9520: 9520-with-tests.diff

File 9520-with-tests.diff, 1.7 KB (added by Eric Holscher, 16 years ago)

diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 673d044..7db6715 100644

                def date(value, arg=None):
         return u''
     if arg is None:
         arg = settings.DATE_FORMAT
+    return format(value, arg)
+    try:
+        return format(value, arg)
+    except AttributeError:
+        return ''
 date.is_safe = False
 def time(value, arg=None):
-…
+               def time(value, arg=None):
         return u''
     if arg is None:
         arg = settings.TIME_FORMAT
+    return time_format(value, arg)
+    try:
+        return time_format(value, arg)
+    except AttributeError:
+        return ''
 time.is_safe = False
 def timesince(value, arg=None):

diff --git a/tests/regressiontests/templates/filters.py b/tests/regressiontests/templates/filters.py
index 91afdc7..e8b1dbe 100644

                def get_filter_tests():
         'join02': (r'{% autoescape off %}{{ a|join:", " }}{% endautoescape %}', {'a': ['alpha', 'beta & me']}, 'alpha, beta & me'),
         'join03': (r'{{ a|join:" &amp; " }}', {'a': ['alpha', 'beta & me']}, 'alpha &amp; beta &amp; me'),
         'join04': (r'{% autoescape off %}{{ a|join:" &amp; " }}{% endautoescape %}', {'a': ['alpha', 'beta & me']}, 'alpha &amp; beta & me'),
+        'date01': (r'{{ d|date:"m" }}', {'d': datetime(2008, 1, 1)}, '01'),
+        'date02': (r'{{ d|date }}', {'d': datetime(2008, 1, 1)}, 'Jan. 1, 2008'),
+        #Ticket 9520: Make sure |date doesn't blow up on non-dates
+        'date03': (r'{{ d|date:"m" }}', {'d': 'fail_string'}, ''),
+    }