mirror of https://github.com/python/cpython
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
(backport from rev. 54114)
This commit is contained in:
parent
ebfcfb015e
commit
131069b3a0
|
@ -430,7 +430,7 @@ class DictTest(unittest.TestCase):
|
|||
except RuntimeError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("e[42] didn't raise RuntimeError")
|
||||
self.fail("e[42] didn't raise RuntimeError")
|
||||
class F(dict):
|
||||
def __init__(self):
|
||||
# An instance variable __missing__ should have no effect
|
||||
|
@ -441,7 +441,7 @@ class DictTest(unittest.TestCase):
|
|||
except KeyError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("f[42] didn't raise KeyError")
|
||||
self.fail("f[42] didn't raise KeyError")
|
||||
class G(dict):
|
||||
pass
|
||||
g = G()
|
||||
|
@ -450,7 +450,7 @@ class DictTest(unittest.TestCase):
|
|||
except KeyError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("g[42] didn't raise KeyError")
|
||||
self.fail("g[42] didn't raise KeyError")
|
||||
|
||||
def test_tuple_keyerror(self):
|
||||
# SF #1576657
|
||||
|
|
|
@ -174,7 +174,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
|
|||
except RuntimeError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("e[42] didn't raise RuntimeError")
|
||||
self.fail("e[42] didn't raise RuntimeError")
|
||||
class F(UserDict.UserDict):
|
||||
def __init__(self):
|
||||
# An instance variable __missing__ should have no effect
|
||||
|
@ -186,7 +186,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
|
|||
except KeyError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("f[42] didn't raise KeyError")
|
||||
self.fail("f[42] didn't raise KeyError")
|
||||
class G(UserDict.UserDict):
|
||||
pass
|
||||
g = G()
|
||||
|
@ -195,7 +195,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
|
|||
except KeyError, err:
|
||||
self.assertEqual(err.args, (42,))
|
||||
else:
|
||||
self.fail_("g[42] didn't raise KeyError")
|
||||
self.fail("g[42] didn't raise KeyError")
|
||||
|
||||
##########################
|
||||
# Test Dict Mixin
|
||||
|
|
Loading…
Reference in New Issue