From e2b70bcf7401477936fba99a8bf4a1f759ecc8a3 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 18 Aug 2006 22:13:04 +0000 Subject: 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. --- Lib/shelve.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Lib/shelve.py') diff --git a/Lib/shelve.py b/Lib/shelve.py index 7a75445b0b..2971354af0 100644 --- a/Lib/shelve.py +++ b/Lib/shelve.py @@ -20,7 +20,7 @@ object): # access returns a *copy* of the entry! del d[key] # delete data stored at key (raises KeyError # if no such key) - flag = d.has_key(key) # true if the key exists; same as "key in d" + flag = key in d # true if the key exists list = d.keys() # a list of all existing keys (slow!) d.close() # close it @@ -94,14 +94,11 @@ class Shelf(UserDict.DictMixin): def __len__(self): return len(self.dict) - def has_key(self, key): - return self.dict.has_key(key) - 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 -- cgit v1.2.1