summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-04-15 21:34:27 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-04-15 21:34:27 (GMT)
commit2808d3c41847ba1f8e07ee678742b6f12528face (patch)
treece0ca8f56fa2bcba75bae34c0eca30cb54505dd4 /Lib
parent50a14695573807aebdeea1c7c057b816b1bbd4a3 (diff)
downloadcpython-2808d3c41847ba1f8e07ee678742b6f12528face.zip
cpython-2808d3c41847ba1f8e07ee678742b6f12528face.tar.gz
cpython-2808d3c41847ba1f8e07ee678742b6f12528face.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 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_float.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 2d3b357..123a69d 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -78,11 +78,18 @@ 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
+
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(FooStr('8')), 9.)
def test_floatasratio(self):
for f, ratio in [