diff options
| author | Eric Smith <eric@trueblade.com> | 2009-04-13 00:50:23 +0000 |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2009-04-13 00:50:23 +0000 |
| commit | c2eea730eb0d7cefdb52769ff8d47a3252089e83 (patch) | |
| tree | 5ec85c21d61fbc1888a12ead30fb2a8ee245c707 /Objects/stringlib | |
| parent | 43ad4e4186f1a30da7e1aa8ee4187715b8993e58 (diff) | |
| download | cpython-c2eea730eb0d7cefdb52769ff8d47a3252089e83.tar.gz | |
Merged revisions 71548 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71548 | eric.smith | 2009-04-12 20:29:50 -0400 (Sun, 12 Apr 2009) | 1 line
Fixed incorrect object passed into format_float_internal(). This was resulting in a conversion being done twice.
........
Diffstat (limited to 'Objects/stringlib')
| -rw-r--r-- | Objects/stringlib/formatter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index b86dc8b15c..d936a6702e 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -968,7 +968,7 @@ format_int_or_long(PyObject* obj, tmp = PyNumber_Float(obj); if (tmp == NULL) goto done; - result = format_float_internal(obj, &format); + result = format_float_internal(tmp, &format); break; default: |