From: Eric Smith <eric@trueblade.com>
Date: Mon, 13 Apr 2009 00:50:23 +0000 (+0000)
Subject: Merged revisions 71548 via svnmerge from
X-Git-Tag: v3.1b1~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f64bce8ea726020152d655dc78df94b79da0ad4d;p=python

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 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: