Merged revisions 74706 via svnmerge from

svn+ssh://pythondev@www.python.org/python/branches/py3k

................
  r74706 | mark.dickinson | 2009-09-07 17:21:56 +0100 (Mon, 07 Sep 2009) | 10 lines

  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:23:26 +00:00
parent b55628f087
commit d496d300ea
3 changed files with 7 additions and 1 deletions

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
# sense; convert it to 1. Same if format type is unspecified.
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
# determine thousands separator, grouping, and decimal separator, and