diff options
| -rw-r--r-- | Lib/fractions.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_fractions.py | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Lib/fractions.py b/Lib/fractions.py index 27b27f40ff..9624c90143 100644 --- a/Lib/fractions.py +++ b/Lib/fractions.py @@ -526,8 +526,6 @@ class Fraction(numbers.Rational): if isinstance(other, numbers.Rational): return op(self._numerator * other.denominator, self._denominator * other.numerator) - if isinstance(other, numbers.Complex) and other.imag == 0: - other = other.real if isinstance(other, float): if math.isnan(other) or math.isinf(other): return op(0.0, other) diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py index fd6588a1fe..5ad0742c5e 100644 --- a/Lib/test/test_fractions.py +++ b/Lib/test/test_fractions.py @@ -479,8 +479,21 @@ class FractionTest(unittest.TestCase): def testBigComplexComparisons(self): self.assertFalse(F(10**23) == complex(10**23)) - self.assertTrue(F(10**23) > complex(10**23)) - self.assertFalse(F(10**23) <= complex(10**23)) + self.assertRaises(TypeError, operator.gt, 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): self.assertTrue(0.5 == F(1, 2)) |