Ticket #5748: 5478.django.template.defaultfilter.diff

django/template/defaultfilters.py

@@ -1 +1 @@
 """Default variable filters."""
 
+try:
+    from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
+except ImportError:
+    from django.utils._decimal import Decimal, InvalidOperation, ROUND_HALF_UP
+
 import re
 import random as random_module
 
@@ -41 +46 @@
 # STRINGS         #
 ###################
 
-
 def addslashes(value):
     """
     Adds slashes before quotes. Useful for escaping strings in CSV, for
@@ -113 +117 @@
     * {{ num3|floatformat:"-3" }} displays "34.260"
     """
     try:
-        f = float(text)
-    except (ValueError, TypeError):
+        d = Decimal(str(text))
+    except InvalidOperation:
         return u''
     try:
-        d = int(arg)
+        arg = int(arg)
     except ValueError:
-        return force_unicode(f)
-    m = f - int(f)
-    if not m and d < 0:
-        return mark_safe(u'%d' % int(f))
+        return force_unicode(d)
+    if not int(d) - d and arg < 0:
+        return mark_safe(u'%d' % (int(d)))
+    if arg == 0:
+        exp = Decimal(1)
     else:
-        formatstr = u'%%.%df' % abs(d)
-        return mark_safe(formatstr % f)
+        exp = Decimal('1.0') / (Decimal(10) ** abs(arg))
+    try:
+        return mark_safe(u'%s' % str(d.quantize(exp, ROUND_HALF_UP)))
+    except InvalidOperation:
+        return force_unicode(d)
 floatformat.is_safe = True
 
 def iriencode(value):

tests/regressiontests/defaultfilters/tests.py

@@ -13 +13 @@
 u'0.0'
 >>> floatformat(0.0)
 u'0'
->>> floatformat(7.7,3)
+>>> floatformat(7.7, 3)
 u'7.700'
->>> floatformat(6.000000,3)
+>>> floatformat(6.000000, 3)
 u'6.000'
 >>> floatformat(6.200000, 3)
 u'6.200'
 >>> floatformat(6.200000, -3)
 u'6.200'
->>> floatformat(13.1031,-3)
+>>> floatformat(13.1031, -3)
 u'13.103'
 >>> floatformat(11.1197, -2)
 u'11.12'
@@ -31 +31 @@
 u'11.00'
 >>> floatformat(8.2798, 3)
 u'8.280'
+>>> floatformat(18.125, 2)
+u'18.13'
 >>> floatformat(u'foo')
 u''
 >>> floatformat(13.1031, u'bar')