mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Issue #10042: Fixed the total_ordering decorator to handle cross-type
comparisons that could lead to infinite recursion.
This commit is contained in:
parent
06ec45e2f8
commit
23f9fc3448
4 changed files with 36 additions and 8 deletions
|
@ -457,6 +457,8 @@ class TestTotalOrdering(unittest.TestCase):
|
|||
self.value = value
|
||||
def __lt__(self, other):
|
||||
return self.value < other.value
|
||||
def __eq__(self, other):
|
||||
return self.value == other.value
|
||||
self.assertTrue(A(1) < A(2))
|
||||
self.assertTrue(A(2) > A(1))
|
||||
self.assertTrue(A(1) <= A(2))
|
||||
|
@ -471,6 +473,8 @@ class TestTotalOrdering(unittest.TestCase):
|
|||
self.value = value
|
||||
def __le__(self, other):
|
||||
return self.value <= other.value
|
||||
def __eq__(self, other):
|
||||
return self.value == other.value
|
||||
self.assertTrue(A(1) < A(2))
|
||||
self.assertTrue(A(2) > A(1))
|
||||
self.assertTrue(A(1) <= A(2))
|
||||
|
@ -485,6 +489,8 @@ class TestTotalOrdering(unittest.TestCase):
|
|||
self.value = value
|
||||
def __gt__(self, other):
|
||||
return self.value > other.value
|
||||
def __eq__(self, other):
|
||||
return self.value == other.value
|
||||
self.assertTrue(A(1) < A(2))
|
||||
self.assertTrue(A(2) > A(1))
|
||||
self.assertTrue(A(1) <= A(2))
|
||||
|
@ -499,6 +505,8 @@ class TestTotalOrdering(unittest.TestCase):
|
|||
self.value = value
|
||||
def __ge__(self, other):
|
||||
return self.value >= other.value
|
||||
def __eq__(self, other):
|
||||
return self.value == other.value
|
||||
self.assertTrue(A(1) < A(2))
|
||||
self.assertTrue(A(2) > A(1))
|
||||
self.assertTrue(A(1) <= A(2))
|
||||
|
@ -524,6 +532,22 @@ class TestTotalOrdering(unittest.TestCase):
|
|||
class A:
|
||||
pass
|
||||
|
||||
def test_bug_10042(self):
|
||||
@functools.total_ordering
|
||||
class TestTO:
|
||||
def __init__(self, value):
|
||||
self.value = value
|
||||
def __eq__(self, other):
|
||||
if isinstance(other, TestTO):
|
||||
return self.value == other.value
|
||||
return False
|
||||
def __lt__(self, other):
|
||||
if isinstance(other, TestTO):
|
||||
return self.value < other.value
|
||||
raise TypeError
|
||||
with self.assertRaises(TypeError):
|
||||
TestTO(8) <= ()
|
||||
|
||||
class TestLRU(unittest.TestCase):
|
||||
|
||||
def test_lru(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue