mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Partially revert r60376: restore ability for ints to be automatically converted to floats, if a float type specifier is given to an int. PEP 3101 should be clarified on this point.Also, remove unused local variables left over from r60376.

Browse source
This commit is contained in:
Eric Smith 2008-01-28 10:59:27 +00:00
parent fe82e774ea
commit fa767efe06
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/stringlib/formatter.h
View file

@ -764,7 +764,6 @@ PyObject *
FORMAT_STRING(PyObject* value, PyObject* args)
{
PyObject *format_spec;
PyObject *tmp = NULL;
PyObject *result = NULL;
InternalFormatSpec format;
@ -796,7 +795,6 @@ FORMAT_STRING(PyObject* value, PyObject* args)
}
done:
Py_XDECREF(tmp);
return result;
}
@ -834,6 +832,21 @@ FORMAT_LONG(PyObject* value, PyObject* args)
result = format_long_internal(value, &format);
break;
case 'e':
case 'E':
case 'f':
case 'F':
case 'g':
case 'G':
case 'n':
case '%':
/* convert to float */
tmp = PyNumber_Float(value);
if (tmp == NULL)
goto done;
result = format_float_internal(value, &format);
break;
default:
/* unknown */
PyErr_Format(PyExc_ValueError, "Unknown conversion type %c",
@ -851,7 +864,6 @@ FORMAT_FLOAT(PyObject *value, PyObject *args)
{
PyObject *format_spec;
PyObject *result = NULL;
PyObject *tmp = NULL;
InternalFormatSpec format;
if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
@ -890,6 +902,5 @@ FORMAT_FLOAT(PyObject *value, PyObject *args)
}
done:
Py_XDECREF(tmp);
return result;
}