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 4b2f3f5..990afa7 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -5630,9 +5630,9 @@
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 f40de8f..eaf9f0b 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -693,6 +693,12 @@
('.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)