Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Couple more has_keys() going...

This commit is contained in:
Guido van Rossum 2006-08-19 16:53:45 +00:00
parent 6e23e3796d
commit e014a13f03
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/lib-tk/FileDialog.py
View File

@ -107,7 +107,7 @@ class FileDialog:
self.top.bind('<Alt-W>', self.cancel_command)
def go(self, dir_or_file=os.curdir, pattern="*", default="", key=None):
if key and dialogstates.has_key(key):
if key and key in dialogstates:
self.directory, pattern = dialogstates[key]
else:
dir_or_file = os.path.expanduser(dir_or_file)

6
Lib/lib-tk/FixTk.py
View File

@ -13,7 +13,7 @@ import sys, os
prefix = os.path.join(sys.prefix,"tcl")
# if this does not exist, no further search is needed
if os.path.exists(prefix):
if not os.environ.has_key("TCL_LIBRARY"):
if "TCL_LIBRARY" not in os.environ:
for name in os.listdir(prefix):
if name.startswith("tcl"):
tcldir = os.path.join(prefix,name)
@ -23,13 +23,13 @@ if os.path.exists(prefix):
# as Tcl
import _tkinter
ver = str(_tkinter.TCL_VERSION)
if not os.environ.has_key("TK_LIBRARY"):
if "TK_LIBRARY" not in os.environ:
v = os.path.join(prefix, 'tk'+ver)
if os.path.exists(os.path.join(v, "tclIndex")):
os.environ['TK_LIBRARY'] = v
# We don't know the Tix version, so we must search the entire
# directory
if not os.environ.has_key("TIX_LIBRARY"):
if "TIX_LIBRARY" not in os.environ:
for name in os.listdir(prefix):
if name.startswith("tix"):
tixdir = os.path.join(prefix,name)

14
Lib/lib-tk/Tix.py
View File

@ -321,7 +321,7 @@ class TixWidget(Tkinter.Widget):
# We can even do w.ok.invoke() because w.ok is subclassed from the
# Button class if you go through the proper constructors
def __getattr__(self, name):
if self.subwidget_list.has_key(name):
if name in self.subwidget_list:
return self.subwidget_list[name]
raise AttributeError, name
@ -446,9 +446,9 @@ class TixSubWidget(TixWidget):
# also destroys the parent NoteBook thus leading to an exception
# in Tkinter when it finally calls Tcl to destroy the NoteBook
for c in self.children.values(): c.destroy()
if self.master.children.has_key(self._name):
if self._name in self.master.children:
del self.master.children[self._name]
if self.master.subwidget_list.has_key(self._name):
if self._name in self.master.subwidget_list:
del self.master.subwidget_list[self._name]
if self.destroy_physically:
# This is bypassed only for a few widgets
@ -470,8 +470,8 @@ class DisplayStyle:
def __init__(self, itemtype, cnf={}, **kw):
master = _default_root # global from Tkinter
if not master and cnf.has_key('refwindow'): master=cnf['refwindow']
elif not master and kw.has_key('refwindow'): master= kw['refwindow']
if not master and 'refwindow' in cnf: master=cnf['refwindow']
elif not master and 'refwindow' in kw: master= kw['refwindow']
elif not master: raise RuntimeError, "Too early to create display style: no root window"
self.tk = master.tk
self.stylename = self.tk.call('tixDisplayStyle', itemtype,
@ -553,7 +553,7 @@ class ButtonBox(TixWidget):
return btn
def invoke(self, name):
if self.subwidget_list.has_key(name):
if name in self.subwidget_list:
self.tk.call(self._w, 'invoke', name)
class ComboBox(TixWidget):
@ -1413,7 +1413,7 @@ class StdButtonBox(TixWidget):
self.subwidget_list['help'] = _dummyButton(self, 'help')
def invoke(self, name):
if self.subwidget_list.has_key(name):
if name in self.subwidget_list:
self.tk.call(self._w, 'invoke', name)
class TList(TixWidget):

28
Lib/lib-tk/Tkinter.py
View File

@ -550,7 +550,7 @@ class Misc:
A widget specified for the optional displayof keyword
argument specifies the target display."""
if not kw.has_key('displayof'): kw['displayof'] = self._w
if 'displayof' not in kw: kw['displayof'] = self._w
self.tk.call(('clipboard', 'clear') + self._options(kw))
def clipboard_append(self, string, **kw):
"""Append STRING to the Tk clipboard.
@ -558,7 +558,7 @@ class Misc:
A widget specified at the optional displayof keyword
argument specifies the target display. The clipboard
can be retrieved with selection_get."""
if not kw.has_key('displayof'): kw['displayof'] = self._w
if 'displayof' not in kw: kw['displayof'] = self._w
self.tk.call(('clipboard', 'append') + self._options(kw)
+ ('--', string))
# XXX grab current w/o window argument
@ -619,7 +619,7 @@ class Misc:
self.tk.call('option', 'readfile', fileName, priority)
def selection_clear(self, **kw):
"""Clear the current X selection."""
if not kw.has_key('displayof'): kw['displayof'] = self._w
if 'displayof' not in kw: kw['displayof'] = self._w
self.tk.call(('selection', 'clear') + self._options(kw))
def selection_get(self, **kw):
"""Return the contents of the current X selection.
@ -628,7 +628,7 @@ class Misc:
the selection and defaults to PRIMARY. A keyword
parameter displayof specifies a widget on the display
to use."""
if not kw.has_key('displayof'): kw['displayof'] = self._w
if 'displayof' not in kw: kw['displayof'] = self._w
return self.tk.call(('selection', 'get') + self._options(kw))
def selection_handle(self, command, **kw):
"""Specify a function COMMAND to call if the X
@ -659,7 +659,7 @@ class Misc:
be provided:
selection - name of the selection (default PRIMARY),
type - type of the selection (e.g. STRING, FILE_NAME)."""
if not kw.has_key('displayof'): kw['displayof'] = self._w
if 'displayof' not in kw: kw['displayof'] = self._w
name = self.tk.call(('selection', 'own') + self._options(kw))
if not name: return None
return self._nametowidget(name)
@ -1692,7 +1692,7 @@ class Tk(Misc, Wm):
the Tcl Interpreter and calls execfile on BASENAME.py and CLASSNAME.py if
such a file exists in the home directory."""
import os
if os.environ.has_key('HOME'): home = os.environ['HOME']
if 'HOME' in os.environ: home = os.environ['HOME']
else: home = os.curdir
class_tcl = os.path.join(home, '.%s.tcl' % className)
class_py = os.path.join(home, '.%s.py' % className)
@ -1808,7 +1808,7 @@ class Place:
into account
"""
for k in ['in_']:
if kw.has_key(k):
if k in kw:
kw[k[:-1]] = kw[k]
del kw[k]
self.tk.call(
@ -1900,7 +1900,7 @@ class BaseWidget(Misc):
self.master = master
self.tk = master.tk
name = None
if cnf.has_key('name'):
if 'name' in cnf:
name = cnf['name']
del cnf['name']
if not name:
@ -1911,7 +1911,7 @@ class BaseWidget(Misc):
else:
self._w = master._w + '.' + name
self.children = {}
if self.master.children.has_key(self._name):
if self._name in self.master.children:
self.master.children[self._name].destroy()
self.master.children[self._name] = self
def __init__(self, master, widgetName, cnf={}, kw={}, extra=()):
@ -1934,7 +1934,7 @@ class BaseWidget(Misc):
"""Destroy this and all descendants widgets."""
for c in self.children.values(): c.destroy()
self.tk.call('destroy', self._w)
if self.master.children.has_key(self._name):
if self._name in self.master.children:
del self.master.children[self._name]
Misc.destroy(self)
def _do(self, name, args=()):
@ -1962,7 +1962,7 @@ class Toplevel(BaseWidget, Wm):
extra = ()
for wmkey in ['screen', 'class_', 'class', 'visual',
'colormap']:
if cnf.has_key(wmkey):
if wmkey in cnf:
val = cnf[wmkey]
# TBD: a hack needed because some keys
# are not valid as keyword arguments
@ -2433,10 +2433,10 @@ class Frame(Widget):
highlightcolor, highlightthickness, relief, takefocus, visual, width."""
cnf = _cnfmerge((cnf, kw))
extra = ()
if cnf.has_key('class_'):
if 'class_' in cnf:
extra = ('-class', cnf['class_'])
del cnf['class_']
elif cnf.has_key('class'):
elif 'class' in cnf:
extra = ('-class', cnf['class'])
del cnf['class']
Widget.__init__(self, master, 'frame', cnf, {}, extra)
@ -3179,7 +3179,7 @@ class OptionMenu(Menubutton):
self.menuname = menu._w
# 'command' is the only supported keyword
callback = kwargs.get('command')
if kwargs.has_key('command'):
if 'command' in kwargs:
del kwargs['command']
if kwargs:
raise TclError, 'unknown option -'+kwargs.keys()[0]

2
Lib/lib-tk/tkSimpleDialog.py
View File

@ -274,7 +274,7 @@ def askfloat(title, prompt, **kw):
class _QueryString(_QueryDialog):
def __init__(self, *args, **kw):
if kw.has_key("show"):
if "show" in kw:
self.__show = kw["show"]
del kw["show"]
else: