summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-03-04 17:18:54 (GMT)
committerGeorg Brandl <georg@python.org>2007-03-04 17:18:54 (GMT)
commit8905bb10e044b70e1d25f3c83afaf309258fee60 (patch)
tree38c67d8bd652ac919b9f9ccd2925a7185ad1a843
parentb5e3f0dfc63c6df79375e528a9c03388b8e0eadb (diff)
downloadcpython-8905bb10e044b70e1d25f3c83afaf309258fee60.zip
cpython-8905bb10e044b70e1d25f3c83afaf309258fee60.tar.gz
cpython-8905bb10e044b70e1d25f3c83afaf309258fee60.tar.bz2
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
-rw-r--r--Lib/test/test_dict.py6
-rw-r--r--Lib/test/test_userdict.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index 6d6e245..e99c46d 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 a4b7de4..357c0f0 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