Get rid of dict.has_key(). Boy this has a lot of repercussions!
Not all code has been fixed yet; this is just a checkpoint...
The C API still has PyDict_HasKey() and _HasKeyString(); not sure
if I want to change those just yet.
diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index bbca798..f168846 100644
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -21,8 +21,8 @@
self.assertEqual(d.keys(), [])
d = {'a': 1, 'b': 2}
k = d.keys()
- self.assert_(d.has_key('a'))
- self.assert_(d.has_key('b'))
+ self.assert_('a' in d)
+ self.assert_('b' in d)
self.assertRaises(TypeError, d.keys, None)
@@ -43,16 +43,6 @@
self.assertRaises(TypeError, d.items, None)
- def test_has_key(self):
- d = {}
- self.assert_(not d.has_key('a'))
- d = {'a': 1, 'b': 2}
- k = d.keys()
- k.sort()
- self.assertEqual(k, ['a', 'b'])
-
- self.assertRaises(TypeError, d.has_key)
-
def test_contains(self):
d = {}
self.assert_(not ('a' in d))