[Python-checkins] r71627 - in python/trunk: Lib/test/test_float.py Misc/NEWS Objects/floatobject.c
benjamin.peterson
python-checkins at python.org
Wed Apr 15 23:26:36 CEST 2009
Author: benjamin.peterson
Date: Wed Apr 15 23:26:36 2009
New Revision: 71627
Log:
call __float__ on str subclasses #5759
tests by R. David Murray
Modified:
python/trunk/Lib/test/test_float.py
python/trunk/Misc/NEWS
python/trunk/Objects/floatobject.c
Modified: python/trunk/Lib/test/test_float.py
==============================================================================
--- python/trunk/Lib/test/test_float.py (original)
+++ python/trunk/Lib/test/test_float.py Wed Apr 15 23:26:36 2009
@@ -82,11 +82,23 @@
def __float__(self):
return 42
+ # Issue 5759: __float__ not called on str subclasses (though it is on
+ # unicode subclasses).
+ class FooStr(str):
+ def __float__(self):
+ return float(str(self)) + 1
+
+ class FooUnicode(unicode):
+ def __float__(self):
+ return float(unicode(self)) + 1
+
self.assertAlmostEqual(float(Foo0()), 42.)
self.assertAlmostEqual(float(Foo1()), 42.)
self.assertAlmostEqual(float(Foo2()), 42.)
self.assertAlmostEqual(float(Foo3(21)), 42.)
self.assertRaises(TypeError, float, Foo4(42))
+ self.assertAlmostEqual(float(FooUnicode('8')), 9.)
+ self.assertAlmostEqual(float(FooStr('8')), 9.)
def test_floatasratio(self):
for f, ratio in [
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Wed Apr 15 23:26:36 2009
@@ -12,6 +12,8 @@
Core and Builtins
-----------------
+- Issue #5759: float() didn't call __float__ on str subclasses.
+
- Issue #5704: the "-3" command-line option now implies "-t".
- Issue #2170: refactored xml.dom.minidom.normalize, increasing both
Modified: python/trunk/Objects/floatobject.c
==============================================================================
--- python/trunk/Objects/floatobject.c (original)
+++ python/trunk/Objects/floatobject.c Wed Apr 15 23:26:36 2009
@@ -1630,7 +1630,9 @@
return float_subtype_new(type, args, kwds); /* Wimp out */
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x))
return NULL;
- if (PyString_Check(x))
+ /* If it's a string, but not a string subclass, use
+ PyFloat_FromString. */
+ if (PyString_CheckExact(x))
return PyFloat_FromString(x, NULL);
return PyNumber_Float(x);
}
More information about the Python-checkins
mailing list