[Python-checkins] cpython (merge 3.3 -> default): Merge issue #16373: Prevent infinite recursion for ABC Set class operations.
andrew.svetlov
python-checkins at python.org
Thu Nov 1 12:32:01 CET 2012
http://hg.python.org/cpython/rev/e67c8803cd82
changeset: 80151:e67c8803cd82
parent: 80148:2d6eec5d01f7
parent: 80150:11a9297733b8
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Thu Nov 01 13:31:31 2012 +0200
summary:
Merge issue #16373: Prevent infinite recursion for ABC Set class operations.
Patch by Serhiy Storchaka.
files:
Lib/collections/abc.py | 4 +-
Lib/test/test_collections.py | 33 ++++++++++++++++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/Lib/collections/abc.py b/Lib/collections/abc.py
--- a/Lib/collections/abc.py
+++ b/Lib/collections/abc.py
@@ -200,12 +200,12 @@
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
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -663,6 +663,39 @@
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)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list