From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 18 Mar 2009 20:28:09 +0000 (+0000)
Subject: Merged revisions 70461 via svnmerge from
X-Git-Tag: 3.0~309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dc2cb35a975aa95b95e2ba1cbc501095ead3ec6;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 70461 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r70461 | antoine.pitrou | 2009-03-18 21:26:42 +0100 (mer., 18 mars 2009) | 3 lines

  svnmerge from trunk for r70457 (sorry, I accidentally deleted the commit message)
........
---

diff --git a/Lib/locale.py b/Lib/locale.py
index 5f7b08221e17..17056b9df216 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -158,7 +158,7 @@ def _group(s, monetary=False):
     groups.reverse()
     return (
         left_spaces + thousands_sep.join(groups) + right_spaces,
-        len(groups) - 1
+        len(thousands_sep) * (len(groups) - 1)
     )
 
 # Strip a given amount of excess padding from the given string