mirror of https://github.com/python/cpython
Merged revisions 79455 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79455 | mark.dickinson | 2010-03-27 11:09:29 +0000 (Sat, 27 Mar 2010) | 2 lines Make Fraction to complex comparisons with <=, <, >= or > raise TypeError. ........
This commit is contained in:
parent
e6be10990d
commit
327f02c60c
|
@ -526,8 +526,6 @@ class Fraction(numbers.Rational):
|
||||||
if isinstance(other, numbers.Rational):
|
if isinstance(other, numbers.Rational):
|
||||||
return op(self._numerator * other.denominator,
|
return op(self._numerator * other.denominator,
|
||||||
self._denominator * other.numerator)
|
self._denominator * other.numerator)
|
||||||
if isinstance(other, numbers.Complex) and other.imag == 0:
|
|
||||||
other = other.real
|
|
||||||
if isinstance(other, float):
|
if isinstance(other, float):
|
||||||
if math.isnan(other) or math.isinf(other):
|
if math.isnan(other) or math.isinf(other):
|
||||||
return op(0.0, other)
|
return op(0.0, other)
|
||||||
|
|
|
@ -479,8 +479,21 @@ class FractionTest(unittest.TestCase):
|
||||||
|
|
||||||
def testBigComplexComparisons(self):
|
def testBigComplexComparisons(self):
|
||||||
self.assertFalse(F(10**23) == complex(10**23))
|
self.assertFalse(F(10**23) == complex(10**23))
|
||||||
self.assertTrue(F(10**23) > complex(10**23))
|
self.assertRaises(TypeError, operator.gt, F(10**23), complex(10**23))
|
||||||
self.assertFalse(F(10**23) <= complex(10**23))
|
self.assertRaises(TypeError, operator.le, F(10**23), complex(10**23))
|
||||||
|
|
||||||
|
x = F(3, 8)
|
||||||
|
z = complex(0.375, 0.0)
|
||||||
|
w = complex(0.375, 0.2)
|
||||||
|
self.assertTrue(x == z)
|
||||||
|
self.assertFalse(x != z)
|
||||||
|
self.assertFalse(x == w)
|
||||||
|
self.assertTrue(x != w)
|
||||||
|
for op in operator.lt, operator.le, operator.gt, operator.ge:
|
||||||
|
self.assertRaises(TypeError, op, x, z)
|
||||||
|
self.assertRaises(TypeError, op, z, x)
|
||||||
|
self.assertRaises(TypeError, op, x, w)
|
||||||
|
self.assertRaises(TypeError, op, w, x)
|
||||||
|
|
||||||
def testMixedEqual(self):
|
def testMixedEqual(self):
|
||||||
self.assertTrue(0.5 == F(1, 2))
|
self.assertTrue(0.5 == F(1, 2))
|
||||||
|
|
Loading…
Reference in New Issue