diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-09 07:24:30 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-09 07:24:30 (GMT) |
| commit | d3ffb8974f85618dfbaacf2d10a32dc0e96f2f3d (patch) | |
| tree | 4eff061ed01ab9ca0ebccb5a61bc8da6972c2ebc | |
| parent | 672237dc6ca1498eabac08554bcbc5bd0fd9ddaa (diff) | |
| download | cpython-d3ffb8974f85618dfbaacf2d10a32dc0e96f2f3d.zip cpython-d3ffb8974f85618dfbaacf2d10a32dc0e96f2f3d.tar.gz cpython-d3ffb8974f85618dfbaacf2d10a32dc0e96f2f3d.tar.bz2 | |
#3777: long(4.2) returned an int, and broke backward compatibility.
the __long__ slot is allowed to return either int or long, but the behaviour of
float objects should not change between 2.5 and 2.6.
Reviewed by Benjamin Peterson
| -rw-r--r-- | Lib/test/test_long.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Objects/floatobject.c | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py index e53fd05..5addd2e 100644 --- a/Lib/test/test_long.py +++ b/Lib/test/test_long.py @@ -279,6 +279,10 @@ class LongTest(unittest.TestCase): self.assertEqual(long(314), 314L) self.assertEqual(long(3.14), 3L) self.assertEqual(long(314L), 314L) + # Check that long() of basic types actually returns a long + self.assertEqual(type(long(314)), long) + self.assertEqual(type(long(3.14)), long) + self.assertEqual(type(long(314L)), long) # Check that conversion from float truncates towards zero self.assertEqual(long(-3.14), -3L) self.assertEqual(long(3.9), 3L) @@ -12,6 +12,11 @@ What's New in Python 2.6 release candidate 1? Core and Builtins ----------------- +- Issue #3777: long() applied to a float object now always return a long + object; previously an int would be returned for small values. the __long__ + method is allowed to return either an int or a long, but the behaviour of + float objects should not change to respect backward compatibility. + - Issue #3751: str.rpartition would perform a left-partition when called with a unicode argument. diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 0b067eb..cb38800 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1105,6 +1105,13 @@ float_trunc(PyObject *v) } static PyObject * +float_long(PyObject *v) +{ + double x = PyFloat_AsDouble(v); + return PyLong_FromDouble(x); +} + +static PyObject * float_float(PyObject *v) { if (PyFloat_CheckExact(v)) @@ -1897,7 +1904,7 @@ static PyNumberMethods float_as_number = { 0, /*nb_or*/ float_coerce, /*nb_coerce*/ float_trunc, /*nb_int*/ - float_trunc, /*nb_long*/ + float_long, /*nb_long*/ float_float, /*nb_float*/ 0, /* nb_oct */ 0, /* nb_hex */ |