Author: jacob
Date: 2009-04-02 00:20:25 -0500 (Thu, 02 Apr 2009)
New Revision: 10365
Modified:
django/trunk/django/template/defaultfilters.py
django/trunk/tests/regressiontests/templates/filters.py
Log:
Fixed #9520: make the date filter fail silently for non-date values. Thanks,
Andrew Badr and Eric Holscher.
Modified: django/trunk/django/template/defaultfilters.py
===================================================================
--- django/trunk/django/template/defaultfilters.py 2009-04-02 05:02:39 UTC
(rev 10364)
+++ django/trunk/django/template/defaultfilters.py 2009-04-02 05:20:25 UTC
(rev 10365)
@@ -681,7 +681,10 @@
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):
@@ -691,7 +694,10 @@
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):
Modified: django/trunk/tests/regressiontests/templates/filters.py
===================================================================
--- django/trunk/tests/regressiontests/templates/filters.py 2009-04-02
05:02:39 UTC (rev 10364)
+++ django/trunk/tests/regressiontests/templates/filters.py 2009-04-02
05:20:25 UTC (rev 10365)
@@ -320,4 +320,10 @@
'join02': (r'{% autoescape off %}{{ a|join:", " }}{% endautoescape
%}', {'a': ['alpha', 'beta & me']}, 'alpha, beta & me'),
'join03': (r'{{ a|join:" & " }}', {'a': ['alpha', 'beta & me']},
'alpha & beta & me'),
'join04': (r'{% autoescape off %}{{ a|join:" & " }}{%
endautoescape %}', {'a': ['alpha', 'beta & me']}, 'alpha & 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'}, ''),
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
