diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-15 21:46:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-15 21:46:14 (GMT) |
| commit | c843a4765a63098b7cb67a1a38627e39c382d369 (patch) | |
| tree | 442719abf461eec98e06e5dd2feb2a89c7b6ca06 | |
| parent | 8b18e2853bac5bf0061ea9ab677e7ae843223ef6 (diff) | |
| download | cpython-c843a4765a63098b7cb67a1a38627e39c382d369.zip cpython-c843a4765a63098b7cb67a1a38627e39c382d369.tar.gz cpython-c843a4765a63098b7cb67a1a38627e39c382d369.tar.bz2 | |
Merged revisions 71627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71627 | benjamin.peterson | 2009-04-15 16:26:36 -0500 (Wed, 15 Apr 2009) | 4 lines
call __float__ on str subclasses #5759
tests by R. David Murray
........
| -rw-r--r-- | Lib/test/test_float.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 9 | ||||
| -rw-r--r-- | Objects/floatobject.c | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 2b6bd78..0b1ae96 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -82,11 +82,23 @@ class GeneralFloatCases(unittest.TestCase): 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 [ @@ -4,10 +4,15 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) -What's New in Python 2.6.2 +What's New in Python 2.6.3 ========================== -*Release date: 14-Apr-2009* +*Release date: XX-XX-XXX* + +Core and Builtins +----------------- + +- Issue #5759: float() didn't call __float__ on str subclasses. What's New in Python 2.6.2 rc 1 diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 881671c..4f041f4 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1630,7 +1630,9 @@ float_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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); } |