summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-03-27 11:09:29 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-03-27 11:09:29 (GMT)
commit71b7fac07ba978630844bdabee59492e329d036c (patch)
treeaadf120def2251712083dbb70c803f53498447ff /Lib
parent355adc5a451ce3b22b66a3af883d35e89e2a0eab (diff)
downloadcpython-71b7fac07ba978630844bdabee59492e329d036c.zip
cpython-71b7fac07ba978630844bdabee59492e329d036c.tar.gz
cpython-71b7fac07ba978630844bdabee59492e329d036c.tar.bz2
Make Fraction to complex comparisons with <=, <, >= or > raise TypeError.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/fractions.py6
-rw-r--r--Lib/test/test_fractions.py17
2 files changed, 19 insertions, 4 deletions
diff --git a/Lib/fractions.py b/Lib/fractions.py
index a934389..7a3e555 100644
--- a/Lib/fractions.py
+++ b/Lib/fractions.py
@@ -511,8 +511,10 @@ class Fraction(Rational):
if isinstance(other, Rational):
return op(self._numerator * other.denominator,
self._denominator * other.numerator)
- if isinstance(other, numbers.Complex) and other.imag == 0:
- other = other.real
+ # comparisons with complex should raise a TypeError, for consistency
+ # with int<->complex, float<->complex, and complex<->complex comparisons.
+ if isinstance(other, complex):
+ raise TypeError("no ordering relation is defined for complex numbers")
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 63ac7fd..a24fcd3 100644
--- a/Lib/test/test_fractions.py
+++ b/Lib/test/test_fractions.py
@@ -473,8 +473,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))