Fixed #10513: floatformat now works with floatish things, not just real floats. Thanks, Alex.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10278 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/template/defaultfilters.py

@@ -149,7 +149,9 @@ def floatformat(text, arg=-1):
     except InvalidOperation:
         if input_val in special_floats:
             return input_val
-        else:
+        try:
+            d = Decimal(force_unicode(float(text)))
+        except (ValueError, InvalidOperation, TypeError, UnicodeEncodeError):
             return u''
     try:
         p = int(arg)

tests/regressiontests/defaultfilters/tests.py

@@ -53,6 +53,15 @@ True
 >>> floatformat(nan) == unicode(nan)
 True
 
+>>> class FloatWrapper(object):
+...     def __init__(self, value):
+...         self.value = value
+...     def __float__(self):
+...         return self.value
+
+>>> floatformat(FloatWrapper(11.000001), -2)
+u'11.00'
+
 >>> addslashes(u'"double quotes" and \'single quotes\'')
 u'\\"double quotes\\" and \\\'single quotes\\\''