Ticket #13810: number_format_r13401.patch

django/utils/numberformat.py

@@ -1 +1 @@
 from django.conf import settings
 
-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:
@@ -22 +22 @@
         str_number = str_number[1:]
     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

tests/regressiontests/i18n/tests.py

@@ -143 +143 @@
         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=','))