From: Eric Smith Date: Mon, 13 Apr 2009 00:58:35 +0000 (+0000) Subject: Merged revisions 71550 via svnmerge from X-Git-Tag: 3.0~231 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92d3b807d750c0529ad707e28dd0d3a1e869d909;p=thirdparty%2FPython%2Fcpython.git Merged revisions 71550 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r71550 | eric.smith | 2009-04-12 20:50:23 -0400 (Sun, 12 Apr 2009) | 9 lines 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. ........ ................ --- diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 86235a64b508..df291584e79b 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: