Ticket #3004: floatformat.5.diff

django/template/defaultfilters.py

@@ -27 +27 @@
     from django.utils.html import fix_ampersands
     return fix_ampersands(value)
 
-def floatformat(text):
+def floatformat(text, precision=1):
     """
-    Displays a floating point number as 34.2 (with one decimal place) -- but
-    only if there's a point to be displayed
+    Rounds a floating point number to the number of decimal places given in the
+    argument, with trailing zeroes and periods stripped. Uses the decimal module
+    for accurate rounding.
     """
+    from decimal import Decimal, InvalidOperation
     try:
-        f = float(text)
-    except ValueError:
+        text = str(text)
+        precision = int(precision)
+        exponent = Decimal(10) ** - precision
+        number = Decimal(text).quantize(exponent)
+    except (InvalidOperation, TypeError, ValueError):
         return ''
-    m = f - int(f)
-    if m:
-        return '%.1f' % f
-    else:
-        return '%d' % int(f)
+    return re.sub(r'\.?0+$', '', str(number))
 
 def linenumbers(value):
     "Displays text with line numbers"

tests/regressiontests/defaultfilters/tests.py

@@ -8 +8 @@
 >>> floatformat(0.07)
 '0.1'
 >>> floatformat(0.007)
-'0.0'
+'0'
 >>> floatformat(0.0)
 '0'
+>>> floatformat(0)
+'0'
+>>> floatformat(3.14159, 2)
+'3.14'
+>>> floatformat(0.0, 2)
+'0'
+>>> floatformat(1.1, 2)
+'1.1'
+>>> floatformat(1.017, 2)
+'1.02'
+>>> floatformat(0.1234567, 4)
+'0.1235'
 
 >>> addslashes('"double quotes" and \'single quotes\'')
 '\\"double quotes\\" and \\\'single quotes\\\''

docs/templates.txt

@@ -924 +924 @@
 floatformat
 ~~~~~~~~~~~
 
-Rounds a floating-point number to one decimal place -- but only if there's a
-decimal part to be displayed. For example:
+Rounds a floating-point number to the number of decimal places given in the
+argument (the dafault is 1), with trailing zeroes and periods stripped.
 
-    * ``36.123`` gets converted to ``36.1``
-    * ``36.15`` gets converted to ``36.2``
-    * ``36`` gets converted to ``36``
+Example:
 
+    * ``{{ "36.12345"|floatformat:2 }}`` displays ``36.12``
+    * ``{{ "36.123"|floatformat }}`` displays ``36.1``
+    * ``{{ "36.15"|floatformat }}`` displays ``36.2``
+    * ``{{ "36"|floatformat }}`` displays ``36``
+
 get_digit
 ~~~~~~~~~