More bug 460020: when F is a subclass of float, disable the unary plus

tim-one · tim-one · commit 0280cf79a71c · 2001-09-11T21:53:35.000Z
optimization (+F(whatever)).
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -1401,6 +1401,7 @@ def __repr__(self):
     a = precfloat(12345)
     verify(float(a) == 12345.0)
     verify(float(a).__class__ is float)
+    verify((+a).__class__ is float)
 
     class madtuple(tuple):
         _rev = None
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
@@ -553,8 +553,12 @@ float_neg(PyFloatObject *v)
 static PyObject *
 float_pos(PyFloatObject *v)
 {
-	Py_INCREF(v);
-	return (PyObject *)v;
+	if (PyFloat_CheckExact(v)) {
+		Py_INCREF(v);
+		return (PyObject *)v;
+	}
+	else
+		return PyFloat_FromDouble(v->ob_fval);
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -553,8 +553,12 @@ float_neg(PyFloatObject *v)`
`553`	`553`	`static PyObject *`
`554`	`554`	`float_pos(PyFloatObject *v)`
`555`	`555`	`{`
`556`		`- Py_INCREF(v);`
`557`		`- return (PyObject *)v;`
	`556`	`+ if (PyFloat_CheckExact(v)) {`
	`557`	`+ Py_INCREF(v);`
	`558`	`+ return (PyObject *)v;`
	`559`	`+ }`
	`560`	`+ else`
	`561`	`+ return PyFloat_FromDouble(v->ob_fval);`
`558`	`562`	`}`
`559`	`563`
`560`	`564`	`static PyObject *`