Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #13810 -- Truncate numbers correctly when given number of decim…

…al positions is zero. Thanks, milosu and Łukasz Rekucki.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 01d0bf011ef9c92892fa0717764d74ecfd2ef2b6 1 parent 0e9692b
@jezdez jezdez authored
View
6 django/utils/numberformat.py
@@ -2,7 +2,7 @@
from django.utils.safestring import mark_safe
-def format(number, decimal_sep, decimal_pos, grouping=0, thousand_sep=''):
+def format(number, decimal_sep, decimal_pos=None, grouping=0, thousand_sep=''):
"""
Gets a number (as a number or string), and returns it as a string,
using formats definied as arguments:
@@ -29,11 +29,11 @@ def format(number, decimal_sep, decimal_pos, grouping=0, thousand_sep=''):
# decimal part
if '.' in str_number:
int_part, dec_part = str_number.split('.')
- if decimal_pos:
+ if decimal_pos is not None:
dec_part = dec_part[:decimal_pos]
else:
int_part, dec_part = str_number, ''
- if decimal_pos:
+ if decimal_pos is not None:
dec_part = dec_part + ('0' * (decimal_pos - len(dec_part)))
if dec_part: dec_part = decimal_sep + dec_part
# grouping
View
1  tests/regressiontests/i18n/tests.py
@@ -171,6 +171,7 @@ def test_locale_independent(self):
settings.USE_THOUSAND_SEPARATOR = False
self.assertEqual(u'66666.66', nformat(self.n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=','))
self.assertEqual(u'66666A6', nformat(self.n, decimal_sep='A', decimal_pos=1, grouping=1, thousand_sep='B'))
+ self.assertEqual(u'66666', nformat(self.n, decimal_sep='X', decimal_pos=0, grouping=1, thousand_sep='Y'))
settings.USE_THOUSAND_SEPARATOR = True
self.assertEqual(u'66,666.66', nformat(self.n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=','))

0 comments on commit 01d0bf0

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