Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #17496 -- Regression in the floatformat template filter, introd…

…uced by the fix for #15789.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e5719b203c5a1ee799cd8cb6100342940e260fd7 1 parent c939334
@aaugustin aaugustin authored
View
2  django/template/defaultfilters.py
@@ -169,7 +169,7 @@ def floatformat(text, arg=-1):
# Set the precision high enough to avoid an exception, see #15789.
tupl = d.as_tuple()
units = len(tupl[1]) - tupl[2]
- prec = abs(arg) + units + 1
+ prec = abs(p) + units + 1
# Avoid conversion to scientific notation by accessing `sign`, `digits`
# and `exponent` from `Decimal.as_tuple()` directly.
View
2  tests/regressiontests/defaultfilters/tests.py
@@ -69,6 +69,8 @@ def __float__(self):
try:
self.assertEqual(floatformat(1.2345, 2), u'1.23')
self.assertEqual(floatformat(15.2042, -3), u'15.204')
+ self.assertEqual(floatformat(1.2345, '2'), u'1.23')
+ self.assertEqual(floatformat(15.2042, '-3'), u'15.204')
self.assertEqual(floatformat(decimal.Decimal('1.2345'), 2), u'1.23')
self.assertEqual(floatformat(decimal.Decimal('15.2042'), -3), u'15.204')
finally:

0 comments on commit e5719b2

Please sign in to comment.
Something went wrong with that request. Please try again.