innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #27394 -- Added scientific notation support for big integers in floatformat filter.

This commit is contained in:
Mariusz Felisiak 2016-11-15 15:07:15 +01:00 committed by Tim Graham
parent 9e4fd3301d
commit 12f7928f5a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/template/defaultfilters.py
View File

@ -134,7 +134,7 @@ def floatformat(text, arg=-1):
""" """
try: try:
input_val = force_text(text) input_val = repr(text)
d = Decimal(input_val) d = Decimal(input_val)
except UnicodeEncodeError: except UnicodeEncodeError:
return '' return ''
@ -165,7 +165,8 @@ def floatformat(text, arg=-1):
try: try:
# Set the precision high enough to avoid an exception, see #15789. # Set the precision high enough to avoid an exception, see #15789.
tupl = d.as_tuple() tupl = d.as_tuple()
units = len(tupl[1]) - tupl[2] units = len(tupl[1])
units += -tupl[2] if m else tupl[2]
prec = abs(p) + units + 1 prec = abs(p) + units + 1
# Avoid conversion to scientific notation by accessing `sign`, `digits` # Avoid conversion to scientific notation by accessing `sign`, `digits`

4
tests/template_tests/filter_tests/test_floatformat.py
View File

@ -54,6 +54,10 @@ class FunctionTests(SimpleTestCase):
self.assertEqual(floatformat('foo', 'bar'), '') self.assertEqual(floatformat('foo', 'bar'), '')
self.assertEqual(floatformat('¿Cómo esta usted?'), '') self.assertEqual(floatformat('¿Cómo esta usted?'), '')
self.assertEqual(floatformat(None), '') self.assertEqual(floatformat(None), '')
self.assertEqual(floatformat(-1.323297138040798e+35, 2), '-132329713804079800000000000000000000.00')
self.assertEqual(floatformat(-1.323297138040798e+35, -2), '-132329713804079800000000000000000000')
self.assertEqual(floatformat(1.5e-15, 20), '0.00000000000000150000')
self.assertEqual(floatformat(1.5e-15, -20), '0.00000000000000150000')
def test_zero_values(self): def test_zero_values(self):
self.assertEqual(floatformat(0, 6), '0.000000') self.assertEqual(floatformat(0, 6), '0.000000')