diff options
| author | Eric Smith <eric@trueblade.com> | 2009-04-13 00:32:15 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2009-04-13 00:32:15 (GMT) |
| commit | 248b2af33fec77a060f70b1cff14a428673f29c3 (patch) | |
| tree | 8bfa77e78cd8dedb96a2fcfc7d0a2bba28a186f5 /Objects | |
| parent | dcfed0e316243b2635ccfee3553eb5eacd3d2135 (diff) | |
| download | cpython-248b2af33fec77a060f70b1cff14a428673f29c3.zip cpython-248b2af33fec77a060f70b1cff14a428673f29c3.tar.gz cpython-248b2af33fec77a060f70b1cff14a428673f29c3.tar.bz2 | |
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')
| -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 86235a6..df29158 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -939,7 +939,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: |