Issue #0002175: Change type() expressions to isinstance() expressions.

Patch from Gerald Britton <gerald.britton@gmail.com>


svn: r10762
This commit is contained in:
Zsolt Foldvari
2008-05-25 19:55:47 +00:00
parent 62b6250d2f
commit 998908175f
53 changed files with 105 additions and 113 deletions

View File

@@ -199,7 +199,7 @@ class OptionListCollection:
f.write('<module name="%s">\n' % escape(module_name))
options = option_list.get_options()
for option_name in options.keys():
if type(options[option_name]) in (type(list()),type(tuple())):
if isinstance(options[option_name], (list, tuple)):
f.write(' <option name="%s" value="" length="%d">\n' % (
escape(option_name),
len(options[option_name]) ) )

View File

@@ -88,9 +88,9 @@ class Tool:
if issubclass(options_class, MenuToolOptions):
# FIXME: pass in person_id
self.options = options_class(name, None, dbstate)
elif type(options_class) == ClassType:
elif isinstance(options_class, ClassType):
self.options = options_class(name)
elif type(options_class) == InstanceType:
elif isinstance(options_class, InstanceType):
self.options = options_class
self.options.load_previous_values()
@@ -219,7 +219,7 @@ class CommandLineTool:
self.options_help[self.show][1])
print " Available values are:"
vals = self.options_help[self.show][2]
if type(vals) in [list,tuple]:
if isinstance(vals, (list, tuple)):
if self.options_help[self.show][3]:
for num in range(len(vals)):
print " %d\t%s" % (num,vals[num])