diff options
| -rw-r--r-- | Lib/_abcoll.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_collections.py | 33 |
2 files changed, 35 insertions, 2 deletions
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py index 2417d18..5ddcea3 100644 --- a/Lib/_abcoll.py +++ b/Lib/_abcoll.py @@ -184,12 +184,12 @@ class Set(Sized, Iterable, Container): def __gt__(self, other): if not isinstance(other, Set): return NotImplemented - return other < self + return other.__lt__(self) def __ge__(self, other): if not isinstance(other, Set): return NotImplemented - return other <= self + return other.__le__(self) def __eq__(self, other): if not isinstance(other, Set): diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 8dc5559..b2a5f05 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -651,6 +651,39 @@ class TestCollectionABCs(ABCTestCase): s |= s self.assertEqual(s, full) + def test_issue16373(self): + # Recursion error comparing comparable and noncomparable + # Set instances + class MyComparableSet(Set): + def __contains__(self, x): + return False + def __len__(self): + return 0 + def __iter__(self): + return iter([]) + class MyNonComparableSet(Set): + def __contains__(self, x): + return False + def __len__(self): + return 0 + def __iter__(self): + return iter([]) + def __le__(self, x): + return NotImplemented + def __lt__(self, x): + return NotImplemented + + cs = MyComparableSet() + ncs = MyNonComparableSet() + with self.assertRaises(TypeError): + ncs < cs + with self.assertRaises(TypeError): + ncs <= cs + with self.assertRaises(TypeError): + cs > ncs + with self.assertRaises(TypeError): + cs >= ncs + def test_Mapping(self): for sample in [dict]: self.assertIsInstance(sample(), Mapping) |