diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-08-01 10:43:42 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-08-01 10:43:42 (GMT) |
| commit | fc070313ddc6868b3679ee8d8e59e2e6bfb12406 (patch) | |
| tree | 35384e656930603ac0562d77eef4bdc52338f984 /Objects | |
| parent | ea6ff81323a6e68c4ce3287011d7319993c66e57 (diff) | |
| download | cpython-fc070313ddc6868b3679ee8d8e59e2e6bfb12406.zip cpython-fc070313ddc6868b3679ee8d8e59e2e6bfb12406.tar.gz cpython-fc070313ddc6868b3679ee8d8e59e2e6bfb12406.tar.bz2 | |
Merged revisions 83400 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83400 | mark.dickinson | 2010-08-01 11:41:49 +0100 (Sun, 01 Aug 2010) | 7 lines
Issue #9416: Fix some issues with complex formatting where the
output with no type specifier failed to match the str output:
- format(complex(-0.0, 2.0), '-') omitted the real part from the output,
- format(complex(0.0, 2.0), '-') included a sign and parentheses.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringlib/formatter.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 62849c5..4770863 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -1140,9 +1140,10 @@ format_complex_internal(PyObject *value, /* Omitted type specifier. Should be like str(self). */ type = 'g'; default_precision = PyFloat_STR_PRECISION; - add_parens = 1; - if (re == 0.0) + if (re == 0.0 && copysign(1.0, re) == 1.0) skip_re = 1; + else + add_parens = 1; } if (type == 'n') @@ -1234,8 +1235,11 @@ format_complex_internal(PyObject *value, n_re_digits, n_re_remainder, re_has_decimal, &locale, &tmp_format); - /* Same formatting, but always include a sign. */ - tmp_format.sign = '+'; + /* Same formatting, but always include a sign, unless the real part is + * going to be omitted, in which case we use whatever sign convention was + * requested by the original format. */ + if (!skip_re) + tmp_format.sign = '+'; n_im_total = calc_number_widths(&im_spec, 0, im_sign_char, p_im, n_im_digits, n_im_remainder, im_has_decimal, &locale, &tmp_format); |