Commit 66939c28 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.1.X] Fixed #11993: fixed the the floatformat filter on NaN values in Python... 

[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
parent 68ac924b

django/template/defaultfilters.py

+1 −1
Original line number Diff line number Diff line
@@ -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: