Ticket #6513: 6513_w_tests.diff

django/template/defaultfilters.py

@@ -124 +124 @@
         d = int(arg)
     except ValueError:
         return force_unicode(f)
-    m = f - int(f)
+    try:
+        m = f - int(f)
+    except OverflowError:
+        return force_unicode(f)
     if not m and d < 0:
         return mark_safe(u'%d' % int(f))
     else:

tests/regressiontests/defaultfilters/tests.py

@@ -39 +39 @@
 u''
 >>> floatformat(None)
 u''
+>>> floatformat(float('infinity'))
+u'inf'
+>>> floatformat(float('nan'))
+u'nan'
 
 >>> addslashes(u'"double quotes" and \'single quotes\'')
 u'\\"double quotes\\" and \\\'single quotes\\\''