Merged revisions 70430 via svnmerge from

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

........
  r70430 | mark.dickinson | 2009-03-17 18:01:03 +0000 (Tue, 17 Mar 2009) | 3 lines

  Fix bug in Decimal __format__ method that swapped left and right
  alignment.
........

diff --git a/Lib/decimal.py b/Lib/decimal.py
index 4b2f3f5d1768ebaa649587c21b35ce8155c40b27..990afa7b015cdff994e8d231e0a603aadabba9b1 100644 (file)
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -5630,9 +5630,9 @@ def _format_align(body, spec_dict):
 
     align = spec_dict['align']
     if align == '<':
-        result = padding + sign + body
-    elif align == '>':
         result = sign + body + padding
+    elif align == '>':
+        result = padding + sign + body
     elif align == '=':
         result = sign + padding + body
     else: #align == '^'

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index f40de8f2078cf9fb15c5b1b60dcb80a2ca44e851..eaf9f0bf0c4fa742111700d8cd737faa6603016a 100644 (file)
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -693,6 +693,12 @@ class DecimalFormatTest(unittest.TestCase):
             ('.0g', '-sNaN', '-sNaN'),
 
             ('', '1.00', '1.00'),
+
+            # check alignment
+            ('<6', '123', '123   '),
+            ('>6', '123', '   123'),
+            ('^6', '123', ' 123  '),
+            ('=+6', '123', '+  123'),
             ]
         for fmt, d, result in test_values:
             self.assertEqual(format(Decimal(d), fmt), result)

diff --git a/Misc/NEWS b/Misc/NEWS
index afeb9879bf1d5f74bb75c65c259b9925a019d3b7..bae6e78c72eb36b38a01afb9c7a9bcc284a9eaf0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -206,6 +206,9 @@ Core and Builtins
 Library
 -------
 
+- Fix Decimal.__format__ bug that swapped the meanings of the '<' and
+  '>' alignment characters.
+
 - Issue #1222: locale.format() bug when the thousands separator is a space
   character.