[Python-checkins] r60927 - python/trunk/Lib/UserDict.py python/trunk/Lib/shelve.py

[raymond.hettinger]

Author: raymond.hettinger
Date: Thu Feb 21 20:24:53 2008
New Revision: 60927

Modified:
   python/trunk/Lib/UserDict.py
   python/trunk/Lib/shelve.py
Log:
Update more instances of has_key().

Modified: python/trunk/Lib/UserDict.py
==============================================================================
--- python/trunk/Lib/UserDict.py	(original)
+++ python/trunk/Lib/UserDict.py	Thu Feb 21 20:24:53 2008
@@ -41,7 +41,7 @@
     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 @@
             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):

Modified: python/trunk/Lib/shelve.py
==============================================================================
--- python/trunk/Lib/shelve.py	(original)
+++ python/trunk/Lib/shelve.py	Thu Feb 21 20:24:53 2008
@@ -95,13 +95,13 @@
         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