summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2005-11-02 19:01:27 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2005-11-02 19:01:27 +0000
commit91a283583cf17b9241bd1b9882783a8aedba4d8e (patch)
tree4e6e00aead39cf841b22cec709ab1b9a05b2b233
parent27efe14c54f3711fcb21cd2d5187be21c94b9117 (diff)
downloaddjango-91a283583cf17b9241bd1b9882783a8aedba4d8e.tar.gz
Made floatformat filter not choke on non-floats
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/template/defaultfilters.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/core/template/defaultfilters.py b/django/core/template/defaultfilters.py
index 2604caf7f9..3a25add5e1 100644
--- a/django/core/template/defaultfilters.py
+++ b/django/core/template/defaultfilters.py
@@ -27,7 +27,10 @@ def floatformat(text, _):
Displays a floating point number as 34.2 (with one decimal place) -- but
only if there's a point to be displayed
"""
- f = float(text)
+ try:
+ f = float(text)
+ except ValueError:
+ return ''
m = f - int(f)
if m:
return '%.1f' % f