From ce2ec49d92b4c31b6ad358402d8a124e7b03e239 Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Tue, 26 Aug 2014 20:49:57 +0200 Subject: [PATCH] Issue 22090: Fix '%' formatting for infinities and NaNs. --- Lib/decimal.py | 2 ++ Lib/test/test_decimal.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Lib/decimal.py b/Lib/decimal.py index 04bf5c2660..19cc50f9db 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -3665,6 +3665,8 @@ class Decimal(object): if self._is_special: sign = _format_sign(self._sign, spec) body = str(self.copy_abs()) + if spec['type'] == '%': + body += '%' return _format_align(sign, body, spec) # a type of None defaults to 'g' or 'G', depending on context diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 09022786ec..610a696076 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -823,6 +823,11 @@ class DecimalFormatTest(unittest.TestCase): # issue 6850 ('a=-7.0', '0.12345', 'aaaa0.1'), + + # issue 22090 + ('<^+15.20%', 'inf', '<<+Infinity%<<<'), + ('\x07>,%', 'sNaN1234567', 'sNaN1234567%'), + ('=10.10%', 'NaN123', ' NaN123%'), ] for fmt, d, result in test_values: self.assertEqual(format(Decimal(d), fmt), result) -- 2.50.1