replace has_key with 'in' operator · python/cpython@6e3dbbd (original) (raw)
`@@ -336,7 +336,7 @@ def init (self, master=None, widgetName=None,
`
336
336
`# We can even do w.ok.invoke() because w.ok is subclassed from the
`
337
337
`# Button class if you go through the proper constructors
`
338
338
`def getattr(self, name):
`
339
``
`-
if self.subwidget_list.has_key(name):
`
``
339
`+
if name in self.subwidget_list:
`
340
340
`return self.subwidget_list[name]
`
341
341
`raise AttributeError, name
`
342
342
``
`@@ -464,9 +464,9 @@ def destroy(self):
`
464
464
`# also destroys the parent NoteBook thus leading to an exception
`
465
465
`# in Tkinter when it finally calls Tcl to destroy the NoteBook
`
466
466
`for c in self.children.values(): c.destroy()
`
467
``
`-
if self.master.children.has_key(self._name):
`
``
467
`+
if self._name in self.master.children:
`
468
468
`del self.master.children[self._name]
`
469
``
`-
if self.master.subwidget_list.has_key(self._name):
`
``
469
`+
if self._name in self.master.subwidget_list:
`
470
470
`del self.master.subwidget_list[self._name]
`
471
471
`if self.destroy_physically:
`
472
472
`# This is bypassed only for a few widgets
`
`@@ -488,8 +488,8 @@ class DisplayStyle:
`
488
488
``
489
489
`def init(self, itemtype, cnf={}, **kw):
`
490
490
`master = _default_root # global from Tkinter
`
491
``
`-
if not master and cnf.has_key('refwindow'): master=cnf['refwindow']
`
492
``
`-
elif not master and kw.has_key('refwindow'): master= kw['refwindow']
`
``
491
`+
if not master and 'refwindow' in cnf: master=cnf['refwindow']
`
``
492
`+
elif not master and 'refwindow' in kw: master= kw['refwindow']
`
493
493
`elif not master: raise RuntimeError, "Too early to create display style: no root window"
`
494
494
`self.tk = master.tk
`
495
495
`self.stylename = self.tk.call('tixDisplayStyle', itemtype,
`
`@@ -571,7 +571,7 @@ def add(self, name, cnf={}, **kw):
`
571
571
`return btn
`
572
572
``
573
573
`def invoke(self, name):
`
574
``
`-
if self.subwidget_list.has_key(name):
`
``
574
`+
if name in self.subwidget_list:
`
575
575
`self.tk.call(self._w, 'invoke', name)
`
576
576
``
577
577
`class ComboBox(TixWidget):
`
`@@ -1433,7 +1433,7 @@ def init(self, master=None, cnf={}, **kw):
`
1433
1433
`self.subwidget_list['help'] = _dummyButton(self, 'help')
`
1434
1434
``
1435
1435
`def invoke(self, name):
`
1436
``
`-
if self.subwidget_list.has_key(name):
`
``
1436
`+
if name in self.subwidget_list:
`
1437
1437
`self.tk.call(self._w, 'invoke', name)
`
1438
1438
``
1439
1439
`class TList(TixWidget, XView, YView):
`