[1.1.X] Fixed #11993: fixed the the floatformat filter on NaN values in Python 2.6.3. Thanks, kklimonda. Backport if [11619] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-12 16:57:01 +00:00 · 2009-10-12 16:57:01 +00:00 · 66939c28b9
parent 68ac924bb3
commit 66939c28b9
1 changed files with 1 additions and 1 deletions
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@ -162,7 +162,7 @@ def floatformat(text, arg=-1):

    try:
        m = int(d) - d
-    except (OverflowError, InvalidOperation):
+    except (ValueError, OverflowError, InvalidOperation):
        return input_val

    if not m and p < 0: