Merged revisions 70444 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70444 | mark.dickinson | 2009-03-18 08:22:51 +0000 (Wed, 18 Mar 2009) | 3 lines

  Fix bug in _insert_thousands_sep: too much zero padding could be
  added for 'n' formats with non-repeating thousands-separator.
........
This commit is contained in:
Mark Dickinson 2009-03-18 08:25:36 +00:00
parent 79f52039fe
commit 7303b594e6
2 changed files with 23 additions and 2 deletions

View file

@ -5690,8 +5690,6 @@ def _insert_thousands_sep(digits, spec, min_width=1):
groups = []
for l in _group_lengths(grouping):
if groups:
min_width -= len(sep)
if l <= 0:
raise ValueError("group length should be positive")
# max(..., 1) forces at least 1 digit to the left of a separator
@ -5701,6 +5699,7 @@ def _insert_thousands_sep(digits, spec, min_width=1):
min_width -= l
if not digits and min_width <= 0:
break
min_width -= len(sep)
else:
l = max(len(digits), min_width, 1)
groups.append('0'*(l - len(digits)) + digits[-l:])