File Decimal.patch of Package python-Django.18994
From 08c5a787262c1ae57f6517d4574b54a5fcaad124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vlastimil=20Z=C3=ADma?= <ziima@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:59:34 +0200
Subject: [PATCH] Fixed #34098 -- Fixed loss of precision for Decimal values in
floatformat filter.
Regression in 12f7928f5a455e330c0a7f19bc86b37baca12811.
---
django/template/defaultfilters.py | 2 +-
tests/template_tests/filter_tests/test_floatformat.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
Index: Django-2.2.28/django/template/defaultfilters.py
===================================================================
--- Django-2.2.28.orig/django/template/defaultfilters.py
+++ Django-2.2.28/django/template/defaultfilters.py
@@ -2,7 +2,7 @@
import random as random_module
import re
import types
-from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation
+from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation, getcontext
from functools import wraps
from operator import itemgetter
from pprint import pformat
@@ -123,7 +123,7 @@ def floatformat(text, arg=-1):
of that value.
"""
try:
- input_val = repr(text)
+ input_val = str(text)
d = Decimal(input_val)
except InvalidOperation:
try:
@@ -140,7 +140,7 @@ def floatformat(text, arg=-1):
except (ValueError, OverflowError, InvalidOperation):
return input_val
- if not m and p < 0:
+ if not m and p <= 0:
return mark_safe(formats.number_format('%d' % (int(d)), 0))
exp = Decimal(1).scaleb(-abs(p))
@@ -149,6 +149,7 @@ def floatformat(text, arg=-1):
units = len(tupl[1])
units += -tupl[2] if m else tupl[2]
prec = abs(p) + units + 1
+ prec = max(getcontext().prec, prec)
# Avoid conversion to scientific notation by accessing `sign`, `digits`,
# and `exponent` from Decimal.as_tuple() directly.
Index: Django-2.2.28/tests/template_tests/filter_tests/test_floatformat.py
===================================================================
--- Django-2.2.28.orig/tests/template_tests/filter_tests/test_floatformat.py
+++ Django-2.2.28/tests/template_tests/filter_tests/test_floatformat.py
@@ -44,6 +44,10 @@ class FunctionTests(SimpleTestCase):
self.assertEqual(floatformat(0.12345, 2), '0.12')
self.assertEqual(floatformat(Decimal('555.555'), 2), '555.56')
self.assertEqual(floatformat(Decimal('09.000')), '9')
+ self.assertEqual(
+ floatformat(Decimal("123456.123456789012345678901"), 21),
+ "123456.123456789012345678901",
+ )
self.assertEqual(floatformat('foo'), '')
self.assertEqual(floatformat(13.1031, 'bar'), '13.1031')
self.assertEqual(floatformat(18.125, 2), '18.13')
@@ -61,6 +65,12 @@ class FunctionTests(SimpleTestCase):
self.assertEqual(floatformat(0, 7), '0.0000000')
self.assertEqual(floatformat(0, 10), '0.0000000000')
self.assertEqual(floatformat(0.000000000000000000015, 20), '0.00000000000000000002')
+ self.assertEqual(floatformat("0.00", 0), "0")
+ self.assertEqual(floatformat(Decimal("0.00"), 0), "0")
+ self.assertEqual(floatformat("0.0000", 2), "0.00")
+ self.assertEqual(floatformat(Decimal("0.0000"), 2), "0.00")
+ self.assertEqual(floatformat("0.000000", 4), "0.0000")
+ self.assertEqual(floatformat(Decimal("0.000000"), 4), "0.0000")
def test_infinity(self):
pos_inf = float(1e30000)
