From a68c4a85ce4f80634aaaba37553db48ba3d3d8fd Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 31 Mar 2009 18:17:21 +0000 Subject: 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index cb16e4bbe1..673d044e5b 100644 --- a/django/template/defaultfilters.py +++ b/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) -- cgit v1.3