mirror of
https://github.com/python/cpython.git
synced 2025-09-18 06:30:38 +00:00
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up without warnings when '-3' is given. More work like this needs to be done in the rest of the stdlib.
This commit is contained in:
parent
b5e2684a1a
commit
8bc0965adf
17 changed files with 44 additions and 39 deletions
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue