summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-09-08 20:20:19 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-09-08 20:20:19 (GMT)
commit5cfa8044ff9fd26dc4915fc2ce5b2d005eea3261 (patch)
treed9e4c236a0ed095d02491c6a49df1fa239f0f79d
parent81809a42c1639ab6f49900eea15808bf71c6e567 (diff)
downloadcpython-5cfa8044ff9fd26dc4915fc2ce5b2d005eea3261.zip
cpython-5cfa8044ff9fd26dc4915fc2ce5b2d005eea3261.tar.gz
cpython-5cfa8044ff9fd26dc4915fc2ce5b2d005eea3261.tar.bz2
Issue #6857: Fix Decimal formatting to be consistent with existing float
formatting: both are now right-aligned by default.
-rw-r--r--Lib/decimal.py5
-rw-r--r--Lib/test/test_decimal.py3
-rw-r--r--Misc/NEWS3
3 files changed, 9 insertions, 2 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py
index a87a4a5..4d1f7f9 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -5497,7 +5497,10 @@ def _parse_format_specifier(format_spec, _localeconv=None):
raise ValueError("Alignment conflicts with '0' in "
"format specifier: " + format_spec)
format_dict['fill'] = fill or ' '
- format_dict['align'] = align or '<'
+ # PEP 3101 originally specified that the default alignment should
+ # be left; it was later agreed that right-aligned makes more sense
+ # for numeric types. See http://bugs.python.org/issue6857.
+ format_dict['align'] = align or '>'
# default sign handling: '-' for negative, '' for positive
if format_dict['sign'] is None:
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 50a855e..0128231 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -712,6 +712,7 @@ class DecimalFormatTest(unittest.TestCase):
('', '1.00', '1.00'),
# test alignment and padding
+ ('6', '123', ' 123'),
('<6', '123', '123 '),
('>6', '123', ' 123'),
('^6', '123', ' 123 '),
@@ -741,7 +742,7 @@ class DecimalFormatTest(unittest.TestCase):
(',', '-1234567', '-1,234,567'),
(',', '-123456', '-123,456'),
('7,', '123456', '123,456'),
- ('8,', '123456', '123,456 '),
+ ('8,', '123456', ' 123,456'),
('08,', '123456', '0,123,456'), # special case: extra 0 needed
('+08,', '123456', '+123,456'), # but not if there's a sign
(' 08,', '123456', ' 123,456'),
diff --git a/Misc/NEWS b/Misc/NEWS
index daea539..3c1c54e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,9 @@ Core and Builtins
Library
-------
+- Issue #6857: Default format() alignment should be '>' for Decimal
+ instances.
+
- Issue #6795: int(Decimal('nan')) now raises ValueError instead of
returning NaN or raising InvalidContext. Also, fix infinite recursion
in long(Decimal('nan')).