diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-09-07 16:23:26 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-09-07 16:23:26 (GMT) |
commit | d496d300ea45ed1e8864050da629d184ea37c70d (patch) | |
tree | 974079c4aae38f50772b94f284f9b3572aff07e0 /Lib/decimal.py | |
parent | b55628f08756e936f46d047130c831b47fd51831 (diff) | |
download | cpython-d496d300ea45ed1e8864050da629d184ea37c70d.zip cpython-d496d300ea45ed1e8864050da629d184ea37c70d.tar.gz cpython-d496d300ea45ed1e8864050da629d184ea37c70d.tar.bz2 |
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.
........
................
Diffstat (limited to 'Lib/decimal.py')
-rw-r--r-- | Lib/decimal.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 8d82cb9..e3af3f0 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -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 |