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

Fix a bug in test_dict and test_userdict, found at the PyPy sprint.

Browse source 
(backport from rev. 54114)
This commit is contained in:
Georg Brandl 2007-03-04 17:19:02 +00:00
parent ebfcfb015e
commit 131069b3a0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_dict.py
View file

@ -430,7 +430,7 @@ class DictTest(unittest.TestCase):
except RuntimeError, err: except RuntimeError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("e[42] didn't raise RuntimeError") self.fail("e[42] didn't raise RuntimeError")
class F(dict): class F(dict):
def __init__(self): def __init__(self):
# An instance variable __missing__ should have no effect # An instance variable __missing__ should have no effect
@ -441,7 +441,7 @@ class DictTest(unittest.TestCase):
except KeyError, err: except KeyError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("f[42] didn't raise KeyError") self.fail("f[42] didn't raise KeyError")
class G(dict): class G(dict):
pass pass
g = G() g = G()
@ -450,7 +450,7 @@ class DictTest(unittest.TestCase):
except KeyError, err: except KeyError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("g[42] didn't raise KeyError") self.fail("g[42] didn't raise KeyError")
def test_tuple_keyerror(self): def test_tuple_keyerror(self):
# SF #1576657 # SF #1576657

6
Lib/test/test_userdict.py
View file

@ -174,7 +174,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
except RuntimeError, err: except RuntimeError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("e[42] didn't raise RuntimeError") self.fail("e[42] didn't raise RuntimeError")
class F(UserDict.UserDict): class F(UserDict.UserDict):
def __init__(self): def __init__(self):
# An instance variable __missing__ should have no effect # An instance variable __missing__ should have no effect
@ -186,7 +186,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
except KeyError, err: except KeyError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("f[42] didn't raise KeyError") self.fail("f[42] didn't raise KeyError")
class G(UserDict.UserDict): class G(UserDict.UserDict):
pass pass
g = G() g = G()
@ -195,7 +195,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol):
except KeyError, err: except KeyError, err:
self.assertEqual(err.args, (42,)) self.assertEqual(err.args, (42,))
else: else:
self.fail_("g[42] didn't raise KeyError") self.fail("g[42] didn't raise KeyError")
########################## ##########################
# Test Dict Mixin # Test Dict Mixin