summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-06 14:10:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-03-06 14:10:45 (GMT)
commitf01c782960f1e4bafa35f908ab3b203db4537253 (patch)
tree37d72c0d826b8248beb86ee1e476bbc11c8f18fa
parentabda8ddd3e4927bda1b58cf60a5d09db186f6ca5 (diff)
parentc19ed37579877667c791458ac2bbacd5190c3ccc (diff)
downloadcpython-f01c782960f1e4bafa35f908ab3b203db4537253.zip
cpython-f01c782960f1e4bafa35f908ab3b203db4537253.tar.gz
cpython-f01c782960f1e4bafa35f908ab3b203db4537253.tar.bz2
merge 3.4
-rw-r--r--Lib/test/test_float.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index bd2d6c3..1baa6a9 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -94,10 +94,6 @@ class GeneralFloatCases(unittest.TestCase):
def test_floatconversion(self):
# Make sure that calls to __float__() work properly
- class Foo0:
- def __float__(self):
- return 42.
-
class Foo1(object):
def __float__(self):
return 42.
@@ -123,7 +119,6 @@ class GeneralFloatCases(unittest.TestCase):
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.)