Changeset 6752

Timestamp:

11/29/07 14:10:00 (9 months ago)

Author:

mtredinnick

Message:

Fixed #6030 -- More robust error handling for the "float" filter. Thanks,
SmileyChris?.

Files:

• django/trunk/django/template/defaultfilters.py (modified) (1 diff)
• django/trunk/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)

django/trunk/django/template/defaultfilters.py

@@ -92 +92 @@
-    try:
-        f = float(text)
-ValueError
+(ValueError, TypeError)
-        return u''
-    try:

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -38 +38 @@
->>> floatformat(u'foo', u'bar')
-u''
+>>> floatformat(None)
+u''
-
->>> addslashes(u'"double quotes" and \'single quotes\'')