Update more instances of has_key().

diff --git a/Lib/UserDict.py b/Lib/UserDict.py
index a786ae0cc81396289feeb217036a1d57af79b9b7..39f4d07dfae0df19a7c3918e77590ab3585edd08 100644 (file)
--- a/Lib/UserDict.py
+++ b/Lib/UserDict.py
@@ -41,7 +41,7 @@ class UserDict:
     def iterkeys(self): return self.data.iterkeys()
     def itervalues(self): return self.data.itervalues()
     def values(self): return self.data.values()
-    def has_key(self, key): return self.data.has_key(key)
+    def has_key(self, key): return key in self.data
     def update(self, dict=None, **kwargs):
         if dict is None:
             pass
@@ -59,7 +59,7 @@ class UserDict:
             return failobj
         return self[key]
     def setdefault(self, key, failobj=None):
-        if not self.has_key(key):
+        if key not in self:
             self[key] = failobj
         return self[key]
     def pop(self, key, *args):

diff --git a/Lib/shelve.py b/Lib/shelve.py
index 7a75445b0bf376c17361a2c319b76537a8daf241..f1a468e211f5cfb122cc849370df9a3ddc6e43ea 100644 (file)
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -95,13 +95,13 @@ class Shelf(UserDict.DictMixin):
         return len(self.dict)
 
     def has_key(self, key):
-        return self.dict.has_key(key)
+        return key in self.dict
 
     def __contains__(self, key):
-        return self.dict.has_key(key)
+        return key in self.dict
 
     def get(self, key, default=None):
-        if self.dict.has_key(key):
+        if key in self.dict:
             return self[key]
         return default