[Python-checkins] r71551 - in python/branches/py3k-short-float-repr: Objects/stringlib/formatter.h

[eric.smith]

Author: eric.smith
Date: Mon Apr 13 02:55:10 2009
New Revision: 71551

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


Modified:
   python/branches/py3k-short-float-repr/   (props changed)
   python/branches/py3k-short-float-repr/Objects/stringlib/formatter.h

Modified: python/branches/py3k-short-float-repr/Objects/stringlib/formatter.h
==============================================================================
--- python/branches/py3k-short-float-repr/Objects/stringlib/formatter.h	(original)
+++ python/branches/py3k-short-float-repr/Objects/stringlib/formatter.h	Mon Apr 13 02:55:10 2009
@@ -1080,7 +1080,7 @@
         tmp = PyNumber_Float(obj);
         if (tmp == NULL)
             goto done;
-        result = format_float_internal(obj, &format);
+        result = format_float_internal(tmp, &format);
         break;
 
     default: