mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-40824: Do not mask errors in __iter__ in "in" and the operator module. (GH-20537)

Browse source 
Unexpected errors in calling the __iter__ method are no longer
masked by TypeError in the "in" operator and functions
operator.contains(), operator.indexOf() and operator.countOf().
This commit is contained in:
Serhiy Storchaka 2020-06-22 10:43:35 +03:00 • committed by GitHub
parent 4901ea9526
commit cafe1b6e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_iter.py
View file

@ -76,6 +76,10 @@ class NoIterClass:
return i
__iter__ = None
class BadIterableClass:
def __iter__(self):
raise ZeroDivisionError
# Main test suite
class TestCase(unittest.TestCase):
@ -658,6 +662,7 @@ class TestCase(unittest.TestCase):
self.assertRaises(TypeError, lambda: 3 in 12)
self.assertRaises(TypeError, lambda: 3 not in map)
self.assertRaises(ZeroDivisionError, lambda: 3 in BadIterableClass())
d = {"one": 1, "two": 2, "three": 3, 1j: 2j}
for k in d:
@ -740,6 +745,7 @@ class TestCase(unittest.TestCase):
self.assertRaises(TypeError, indexOf, 42, 1)
self.assertRaises(TypeError, indexOf, indexOf, indexOf)
self.assertRaises(ZeroDivisionError, indexOf, BadIterableClass(), 1)
f = open(TESTFN, "w")
try:
@ -1027,6 +1033,7 @@ class TestCase(unittest.TestCase):
def test_error_iter(self):
for typ in (DefaultIterClass, NoIterClass):
self.assertRaises(TypeError, iter, typ())
self.assertRaises(ZeroDivisionError, iter, BadIterableClass())
def test_main():

7
Lib/test/test_operator.py
View file

@ -35,6 +35,10 @@ class Seq2(object):
def __rmul__(self, other):
return other * self.lst
class BadIterable:
def __iter__(self):
raise ZeroDivisionError
class OperatorTestCase:
def test_lt(self):
@ -142,6 +146,7 @@ class OperatorTestCase:
operator = self.module
self.assertRaises(TypeError, operator.countOf)
self.assertRaises(TypeError, operator.countOf, None, None)
self.assertRaises(ZeroDivisionError, operator.countOf, BadIterable(), 1)
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 3), 1)
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 5), 0)
@ -176,6 +181,7 @@ class OperatorTestCase:
operator = self.module
self.assertRaises(TypeError, operator.indexOf)
self.assertRaises(TypeError, operator.indexOf, None, None)
self.assertRaises(ZeroDivisionError, operator.indexOf, BadIterable(), 1)
self.assertEqual(operator.indexOf([4, 3, 2, 1], 3), 1)
self.assertRaises(ValueError, operator.indexOf, [4, 3, 2, 1], 0)
@ -258,6 +264,7 @@ class OperatorTestCase:
operator = self.module
self.assertRaises(TypeError, operator.contains)
self.assertRaises(TypeError, operator.contains, None, None)
self.assertRaises(ZeroDivisionError, operator.contains, BadIterable(), 1)
self.assertTrue(operator.contains(range(4), 2))
self.assertFalse(operator.contains(range(4), 5))