From 131069b3a0b3370ac1f6e518c8f67fa19d7644cf Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 4 Mar 2007 17:19:02 +0000 Subject: [PATCH] Fix a bug in test_dict and test_userdict, found at the PyPy sprint. (backport from rev. 54114) --- Lib/test/test_dict.py | 6 +++--- Lib/test/test_userdict.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index 6d6e245d42b..e99c46d9655 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -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 diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py index a4b7de406bf..357c0f04a31 100644 --- a/Lib/test/test_userdict.py +++ b/Lib/test/test_userdict.py @@ -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