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.
This commit is contained in:
Guido van Rossum 2006-08-18 22:13:04 +00:00
parent d2dbecb4ae
commit e2b70bcf74
93 changed files with 215 additions and 313 deletions

View file

@ -89,7 +89,7 @@ class TextFile:
# set values for all options -- either from client option hash
# or fallback to default_options
for opt in self.default_options.keys():
if options.has_key (opt):
if opt in options:
setattr (self, opt, options[opt])
else:
@ -97,7 +97,7 @@ class TextFile:
# sanity check client option hash
for opt in options.keys():
if not self.default_options.has_key (opt):
if opt not in self.default_options:
raise KeyError, "invalid TextFile option '%s'" % opt
if file is None: