diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/defaultfilters.py | 4 |
1 files changed, 3 insertions, 1 deletions
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) |