diff options
| author | Brett Cannon <bcannon@gmail.com> | 2005-04-26 03:45:26 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2005-04-26 03:45:26 (GMT) |
| commit | c3647ac93e2a38762de8a23b1d94a6380e9ad468 (patch) | |
| tree | a7e00a7e8f70ee226fdeb3d229b9734d5b17a344 /Objects/floatobject.c | |
| parent | d7c795e72966f7c72b94b919f3539be66495e6c3 (diff) | |
| download | cpython-c3647ac93e2a38762de8a23b1d94a6380e9ad468.zip cpython-c3647ac93e2a38762de8a23b1d94a6380e9ad468.tar.gz cpython-c3647ac93e2a38762de8a23b1d94a6380e9ad468.tar.bz2 | |
Make subclasses of int, long, complex, float, and unicode perform type
conversion using the proper magic slot (e.g., __int__()). Also move conversion
code out of PyNumber_*() functions in the C API into the nb_* function.
Applied patch #1109424. Thanks Walter Doewald.
Diffstat (limited to 'Objects/floatobject.c')
| -rw-r--r-- | Objects/floatobject.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 539c4a9..55f43cb 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -926,7 +926,10 @@ float_int(PyObject *v) static PyObject * float_float(PyObject *v) { - Py_INCREF(v); + if (PyFloat_CheckExact(v)) + Py_INCREF(v); + else + v = PyFloat_FromDouble(((PyFloatObject *)v)->ob_fval); return v; } |