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

Clear the -3 warnings in optparse.py

This commit is contained in:
Raymond Hettinger 2008-07-10 15:37:08 +00:00
parent 9be2ec109b
commit 930795b7e0
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/optparse.py
View File

@ -602,7 +602,7 @@ class Option:
def _set_attrs(self, attrs): def _set_attrs(self, attrs):
for attr in self.ATTRS: for attr in self.ATTRS:
if attrs.has_key(attr): if attr in attrs:
setattr(self, attr, attrs[attr]) setattr(self, attr, attrs[attr])
del attrs[attr] del attrs[attr]
else: else:
@ -701,7 +701,7 @@ class Option:
def _check_callback(self): def _check_callback(self):
if self.action == "callback": if self.action == "callback":
if not callable(self.callback): if not hasattr(self.callback, '__call__'):
raise OptionError( raise OptionError(
"callback not callable: %r" % self.callback, self) "callback not callable: %r" % self.callback, self)
if (self.callback_args is not None and if (self.callback_args is not None and
@ -817,12 +817,6 @@ class Option:
SUPPRESS_HELP = "SUPPRESS"+"HELP" SUPPRESS_HELP = "SUPPRESS"+"HELP"
SUPPRESS_USAGE = "SUPPRESS"+"USAGE" SUPPRESS_USAGE = "SUPPRESS"+"USAGE"
# For compatibility with Python 2.2
try:
True, False
except NameError:
(True, False) = (1, 0)
try: try:
basestring basestring
except NameError: except NameError:
@ -860,7 +854,7 @@ class Values:
are silently ignored. are silently ignored.
""" """
for attr in dir(self): for attr in dir(self):
if dict.has_key(attr): if attr in dict:
dval = dict[attr] dval = dict[attr]
if dval is not None: if dval is not None:
setattr(self, attr, dval) setattr(self, attr, dval)
@ -980,10 +974,10 @@ class OptionContainer:
def _check_conflict(self, option): def _check_conflict(self, option):
conflict_opts = [] conflict_opts = []
for opt in option._short_opts: for opt in option._short_opts:
if self._short_opt.has_key(opt): if opt in self._short_opt:
conflict_opts.append((opt, self._short_opt[opt])) conflict_opts.append((opt, self._short_opt[opt]))
for opt in option._long_opts: for opt in option._long_opts:
if self._long_opt.has_key(opt): if opt in self._long_opt:
conflict_opts.append((opt, self._long_opt[opt])) conflict_opts.append((opt, self._long_opt[opt]))
if conflict_opts: if conflict_opts:
@ -1029,7 +1023,7 @@ class OptionContainer:
if option.dest is not None: # option has a dest, we need a default if option.dest is not None: # option has a dest, we need a default
if option.default is not NO_DEFAULT: if option.default is not NO_DEFAULT:
self.defaults[option.dest] = option.default self.defaults[option.dest] = option.default
elif not self.defaults.has_key(option.dest): elif option.dest not in self.defaults:
self.defaults[option.dest] = None self.defaults[option.dest] = None
return option return option
@ -1045,8 +1039,8 @@ class OptionContainer:
self._long_opt.get(opt_str)) self._long_opt.get(opt_str))
def has_option(self, opt_str): def has_option(self, opt_str):
return (self._short_opt.has_key(opt_str) or return (opt_str in self._short_opt or
self._long_opt.has_key(opt_str)) opt_str in self._long_opt)
def remove_option(self, opt_str): def remove_option(self, opt_str):
option = self._short_opt.get(opt_str) option = self._short_opt.get(opt_str)
@ -1664,7 +1658,7 @@ def _match_abbrev(s, wordmap):
'words', raise BadOptionError. 'words', raise BadOptionError.
""" """
# Is there an exact match? # Is there an exact match?
if wordmap.has_key(s): if s in wordmap:
return s return s
else: else:
# Isolate all words with s as a prefix. # Isolate all words with s as a prefix.