traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 74704 via svnmerge from 

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

........
  r74704 | mark.dickinson | 2009-09-07 17:17:41 +0100 (Mon, 07 Sep 2009) | 3 lines

  Issue #6850: Fix bug in Decimal._parse_format_specifier for formats
  with no type specifier.
........
This commit is contained in:
Mark Dickinson 2009-09-07 16:21:56 +00:00
parent d9ee87a43d
commit 7718d2bfb0
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/decimal.py
View File

@ -5592,7 +5592,7 @@ def _parse_format_specifier(format_spec, _localeconv=None):
# if format type is 'g' or 'G' then a precision of 0 makes little # if format type is 'g' or 'G' then a precision of 0 makes little
# sense; convert it to 1. Same if format type is unspecified. # sense; convert it to 1. Same if format type is unspecified.
if format_dict['precision'] == 0: if format_dict['precision'] == 0:
if format_dict['type'] in 'gG' or format_dict['type'] is None: if format_dict['type'] is None or format_dict['type'] in 'gG':
format_dict['precision'] = 1 format_dict['precision'] = 1
# determine thousands separator, grouping, and decimal separator, and # determine thousands separator, grouping, and decimal separator, and

3
Lib/test/test_decimal.py
View File

@ -749,6 +749,9 @@ class DecimalFormatTest(unittest.TestCase):
(',%', '123.456789', '12,345.6789%'), (',%', '123.456789', '12,345.6789%'),
(',e', '123456', '1.23456e+5'), (',e', '123456', '1.23456e+5'),
(',E', '123456', '1.23456E+5'), (',E', '123456', '1.23456E+5'),
# issue 6850
('a=-7.0', '0.12345', 'aaaa0.1'),
] ]
for fmt, d, result in test_values: for fmt, d, result in test_values:
self.assertEqual(format(Decimal(d), fmt), result) self.assertEqual(format(Decimal(d), fmt), result)

3
Misc/NEWS
View File

@ -70,6 +70,9 @@ C-API
Library Library
------- -------
- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats
with no type specifier.
- Issue #6239: ctypes.c_char_p return value must return bytes. - Issue #6239: ctypes.c_char_p return value must return bytes.
- Issue #6838: Use a list to accumulate the value instead of - Issue #6838: Use a list to accumulate the value instead of