mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-01-18 06:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge issue #16373: Prevent infinite recursion for ABC Set class operations.

Browse Source 
Patch by Serhiy Storchaka.
This commit is contained in:
Andrew Svetlov 2012-11-01 13:31:31 +02:00
commit 73ee816d05
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/collections/abc.py
View File

@ -200,12 +200,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):

33
Lib/test/test_collections.py
View File

@ -663,6 +663,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)