[Python-checkins] r71549 - in python/branches/release26-maint: Objects/stringlib/formatter.h

[eric.smith]

Author: eric.smith
Date: Mon Apr 13 02:32:15 2009
New Revision: 71549

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/stringlib/formatter.h

Modified: python/branches/release26-maint/Objects/stringlib/formatter.h
==============================================================================
--- python/branches/release26-maint/Objects/stringlib/formatter.h	(original)
+++ python/branches/release26-maint/Objects/stringlib/formatter.h	Mon Apr 13 02:32:15 2009
@@ -939,7 +939,7 @@
         tmp = PyNumber_Float(obj);
         if (tmp == NULL)
             goto done;
-        result = format_float_internal(obj, &format);
+        result = format_float_internal(tmp, &format);
         break;
 
     default: