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

diff --git a/Lib/locale.py b/Lib/locale.py
index 5f7b08221e171e62218d1dc1b45d22bd3aa7bb7c..17056b9df216fc1076b040e9f2ab962021c50b00 100644 (file)
--- 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