From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 4 Aug 2008 21:17:15 +0000 (+0000)
Subject: Remove dict.has_key() usage in the shelve module to silence warnings under -3.
X-Git-Tag: v2.6b3~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=753ecb13db3334e0368e9e9296a27e9132ce8894;p=thirdparty%2FPython%2Fcpython.git

Remove dict.has_key() usage in the shelve module to silence warnings under -3.
---

diff --git a/Lib/shelve.py b/Lib/shelve.py
index 2a430f374b7c..1f78fc17fd3c 100644
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -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