[Python-checkins] r54115 - python/branches/release25-maint/Lib/test/test_dict.py python/branches/release25-maint/Lib/test/test_userdict.py

Sun Mar 4 18:19:04 CET 2007

Author: georg.brandl
Date: Sun Mar 4 18:19:02 2007
New Revision: 54115
Modified:
 python/branches/release25-maint/Lib/test/test_dict.py
 python/branches/release25-maint/Lib/test/test_userdict.py
Log:
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
 (backport from rev. 54114)
Modified: python/branches/release25-maint/Lib/test/test_dict.py
==============================================================================

--- python/branches/release25-maint/Lib/test/test_dict.py	(original)
+++ python/branches/release25-maint/Lib/test/test_dict.py	Sun Mar 4 18:19:02 2007
@@ -430,7 +430,7 @@
 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 @@
 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 @@
 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
Modified: python/branches/release25-maint/Lib/test/test_userdict.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_userdict.py	(original)
+++ python/branches/release25-maint/Lib/test/test_userdict.py	Sun Mar 4 18:19:02 2007
@@ -174,7 +174,7 @@
 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 @@
 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 @@
 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
