]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Remove dict.has_key() usage in the shelve module to silence warnings under -3.
authorBrett Cannon <bcannon@gmail.com>
Mon, 4 Aug 2008 21:17:15 +0000 (21:17 +0000)
committerBrett Cannon <bcannon@gmail.com>
Mon, 4 Aug 2008 21:17:15 +0000 (21:17 +0000)
Lib/shelve.py

index 2a430f374b7cf8df773dac3cb0988e435ddb4d93..1f78fc17fd3c745b78b15f5a934ec680e38e6561 100644 (file)
@@ -105,13 +105,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