From 811c4e0b7cb1a3b43cda8dab0b1587983b44c58d Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 22 Aug 2006 15:45:46 +0000 Subject: [PATCH] Remove has_key() references from idlelib. IDLE still doesn't run due to relative import issues. Any volunteers? --- Lib/idlelib/EditorWindow.py | 4 ++-- Lib/idlelib/FileList.py | 4 ++-- Lib/idlelib/MultiCall.py | 2 +- Lib/idlelib/MultiStatusBar.py | 2 +- Lib/idlelib/ObjectBrowser.py | 2 +- Lib/idlelib/PathBrowser.py | 2 +- Lib/idlelib/RemoteDebugger.py | 2 +- Lib/idlelib/TreeWidget.py | 2 +- Lib/idlelib/WidgetRedirector.py | 4 ++-- Lib/idlelib/configDialog.py | 10 +++++----- Lib/idlelib/rpc.py | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 6b8ab63ddcf..dccd3ff9d17 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -648,8 +648,8 @@ def ApplyKeybindings(self): if accel: itemName = menu.entrycget(index, 'label') event = '' - if menuEventDict.has_key(menubarItem): - if menuEventDict[menubarItem].has_key(itemName): + if menubarItem in menuEventDict: + if itemName in menuEventDict[menubarItem]: event = menuEventDict[menubarItem][itemName] if event: accel = get_accelerator(keydefs, event) diff --git a/Lib/idlelib/FileList.py b/Lib/idlelib/FileList.py index 4b57901027d..2ef0640c0d3 100644 --- a/Lib/idlelib/FileList.py +++ b/Lib/idlelib/FileList.py @@ -25,7 +25,7 @@ def open(self, filename, action=None): master=self.root) return None key = os.path.normcase(filename) - if self.dict.has_key(key): + if key in self.dict: edit = self.dict[key] edit.top.wakeup() return edit @@ -79,7 +79,7 @@ def filename_changed_edit(self, edit): newkey = os.path.normcase(filename) if newkey == key: return - if self.dict.has_key(newkey): + if newkey in self.dict: conflict = self.dict[newkey] self.inversedict[conflict] = None tkMessageBox.showerror( diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py index 1c6103ad648..40db92db738 100644 --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -187,7 +187,7 @@ def __init__(self, type, widget, widgetinst): seq, handler))) def bind(self, triplet, func): - if not self.bindedfuncs.has_key(triplet[2]): + if triplet[2] not in self.bindedfuncs: self.bindedfuncs[triplet[2]] = [[] for s in _states] for s in _states: lists = [ self.bindedfuncs[detail][i] diff --git a/Lib/idlelib/MultiStatusBar.py b/Lib/idlelib/MultiStatusBar.py index 2d4c5473d40..8ee2d03d045 100644 --- a/Lib/idlelib/MultiStatusBar.py +++ b/Lib/idlelib/MultiStatusBar.py @@ -9,7 +9,7 @@ def __init__(self, master=None, **kw): self.labels = {} def set_label(self, name, text='', side=LEFT): - if not self.labels.has_key(name): + if name not in self.labels: label = Label(self, bd=1, relief=SUNKEN, anchor=W) label.pack(side=side) self.labels[name] = label diff --git a/Lib/idlelib/ObjectBrowser.py b/Lib/idlelib/ObjectBrowser.py index a2a6cee4981..b4f64b6fb24 100644 --- a/Lib/idlelib/ObjectBrowser.py +++ b/Lib/idlelib/ObjectBrowser.py @@ -126,7 +126,7 @@ def keys(self): def make_objecttreeitem(labeltext, object, setfunction=None): t = type(object) - if dispatch.has_key(t): + if t in dispatch: c = dispatch[t] else: c = ObjectTreeItem diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py index 86cd2707dc1..8c735879043 100644 --- a/Lib/idlelib/PathBrowser.py +++ b/Lib/idlelib/PathBrowser.py @@ -78,7 +78,7 @@ def listmodules(self, allnames): normed_name = os.path.normcase(name) if normed_name[i:] == suff: mod_name = name[:i] - if not modules.has_key(mod_name): + if mod_name not in modules: modules[mod_name] = None sorted.append((normed_name, name)) allnames.remove(name) diff --git a/Lib/idlelib/RemoteDebugger.py b/Lib/idlelib/RemoteDebugger.py index 74085c36f51..0422cce335b 100644 --- a/Lib/idlelib/RemoteDebugger.py +++ b/Lib/idlelib/RemoteDebugger.py @@ -231,7 +231,7 @@ def _get_f_locals(self): return self._get_dict_proxy(did) def _get_dict_proxy(self, did): - if self._dictcache.has_key(did): + if did in self._dictcache: return self._dictcache[did] dp = DictProxy(self._conn, self._oid, did) self._dictcache[did] = dp diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/TreeWidget.py index c5c171fb83c..1d777dfb498 100644 --- a/Lib/idlelib/TreeWidget.py +++ b/Lib/idlelib/TreeWidget.py @@ -410,7 +410,7 @@ def GetSubList(self): class ScrolledCanvas: def __init__(self, master, **opts): - if not opts.has_key('yscrollincrement'): + if 'yscrollincrement' not in opts: opts['yscrollincrement'] = 17 self.master = master self.frame = Frame(master) diff --git a/Lib/idlelib/WidgetRedirector.py b/Lib/idlelib/WidgetRedirector.py index df60cea4f51..126a2cd6727 100644 --- a/Lib/idlelib/WidgetRedirector.py +++ b/Lib/idlelib/WidgetRedirector.py @@ -29,7 +29,7 @@ def close(self): tk.call("rename", orig, w) def register(self, name, function): - if self.dict.has_key(name): + if name in self.dict: previous = dict[name] else: previous = OriginalCommand(self, name) @@ -38,7 +38,7 @@ def register(self, name, function): return previous def unregister(self, name): - if self.dict.has_key(name): + if name in self.dict: function = self.dict[name] del self.dict[name] if hasattr(self.widget, name): diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 2d8835c2a6b..c1cbf82c1e8 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -550,7 +550,7 @@ def ResetChangedItems(self): def AddChangedItem(self,type,section,item,value): value=str(value) #make sure we use a string - if not self.changedItems[type].has_key(section): + if section not in self.changedItems[type]: self.changedItems[type][section]={} self.changedItems[type][section][item]=value @@ -697,7 +697,7 @@ def DeleteCustomKeys(self): return #remove key set from config idleConf.userCfg['keys'].remove_section(keySetName) - if self.changedItems['keys'].has_key(keySetName): + if keySetName in self.changedItems['keys']: del(self.changedItems['keys'][keySetName]) #write changes idleConf.userCfg['keys'].Save() @@ -724,7 +724,7 @@ def DeleteCustomTheme(self): return #remove theme from config idleConf.userCfg['highlight'].remove_section(themeName) - if self.changedItems['highlight'].has_key(themeName): + if themeName in self.changedItems['highlight']: del(self.changedItems['highlight'][themeName]) #write changes idleConf.userCfg['highlight'].Save() @@ -859,9 +859,9 @@ def PaintThemeSample(self): #handle any unsaved changes to this theme if theme in self.changedItems['highlight'].keys(): themeDict=self.changedItems['highlight'][theme] - if themeDict.has_key(element+'-foreground'): + if element+'-foreground' in themeDict: colours['foreground']=themeDict[element+'-foreground'] - if themeDict.has_key(element+'-background'): + if element+'-background' in themeDict: colours['background']=themeDict[element+'-background'] self.textHighlightSample.tag_config(element, **colours) self.SetColourSample() diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 3bac6a30b39..e3a42d943a3 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -169,7 +169,7 @@ def localcall(self, seq, request): how, (oid, methodname, args, kwargs) = request except TypeError: return ("ERROR", "Bad request format") - if not self.objtable.has_key(oid): + if oid not in self.objtable: return ("ERROR", "Unknown object id: %r" % (oid,)) obj = self.objtable[oid] if methodname == "__methods__": @@ -304,7 +304,7 @@ def _getresponse(self, myseq, wait): # wait for notification from socket handling thread cvar = self.cvars[myseq] cvar.acquire() - while not self.responses.has_key(myseq): + while myseq not in self.responses: cvar.wait() response = self.responses[myseq] self.debug("_getresponse:%s: thread woke up: response: %s" % @@ -552,7 +552,7 @@ def __getattr__(self, name): return MethodProxy(self.sockio, self.oid, name) if self.__attributes is None: self.__getattributes() - if self.__attributes.has_key(name): + if name in self.__attributes: value = self.sockio.remotecall(self.oid, '__getattribute__', (name,), {}) return value