summaryrefslogtreecommitdiffstats
path: root/Objects/stringlib/formatter.h
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2009-04-13 00:50:23 (GMT)
committerEric Smith <eric@trueblade.com>2009-04-13 00:50:23 (GMT)
commitf64bce8ea726020152d655dc78df94b79da0ad4d (patch)
tree76c03cd38e8944f1eaa2c97e88c41bfcf4534d73 /Objects/stringlib/formatter.h
parent8ad7691917aaccfa9d7c8e30b9daaa98792c3f50 (diff)
downloadcpython-f64bce8ea726020152d655dc78df94b79da0ad4d.zip
cpython-f64bce8ea726020152d655dc78df94b79da0ad4d.tar.gz
cpython-f64bce8ea726020152d655dc78df94b79da0ad4d.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/stringlib/formatter.h')
-rw-r--r--Objects/stringlib/formatter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index b86dc8b..d936a67 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: