Fixed #6030 -- More robust error handling for the "float" filter. Tha…

…nks, SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Nov 29, 2007 · 5d1d054 · 5d1d054
1 parent caa0523
commit 5d1d054
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
@@ -91,7 +91,7 @@ def floatformat(text, arg=-1):
     """
     try:
         f = float(text)
-    except ValueError:
+    except (ValueError, TypeError):
         return u''
     try:
         d = int(arg)

diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py
@@ -37,6 +37,8 @@
 u'13.1031'
 >>> floatformat(u'foo', u'bar')
 u''
+>>> floatformat(None)
+u''
 
 >>> addslashes(u'"double quotes" and \'single quotes\'')
 u'\\"double quotes\\" and \\\'single quotes\\\''