From 714168248d8d20f124e7249c93c211d478067a36 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 17 Mar 2009 18:07:41 +0000
Subject: [PATCH] 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.
........
---
 Lib/decimal.py           | 4 ++--
 Lib/test/test_decimal.py | 6 ++++++
 Misc/NEWS                | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Lib/decimal.py b/Lib/decimal.py
index 3ad80b35295..6529cc8d77a 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -5491,9 +5491,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 114cd5b7900..92b029e8edc 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -704,6 +704,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 d2757e8ac5f..74a12b8d799 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,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.