mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't use StringType -- always test for basestring.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-04 17:44:47 +00:00
parent 7fcf224ec8
commit c2b87a6dff
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/optparse.py
View file

@ -823,7 +823,7 @@ except NameError:
(True, False) = (1, 0) (True, False) = (1, 0)
def isbasestring(x): def isbasestring(x):
return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType) return isinstance(x, basestring)
class Values: class Values:
@ -1001,7 +1001,7 @@ class OptionContainer:
"""add_option(Option) """add_option(Option)
add_option(opt_str, ..., kwarg=val, ...) add_option(opt_str, ..., kwarg=val, ...)
""" """
if type(args[0]) is types.StringType: if isbasestring(args[0]):
option = self.option_class(*args, **kwargs) option = self.option_class(*args, **kwargs)
elif len(args) == 1 and not kwargs: elif len(args) == 1 and not kwargs:
option = args[0] option = args[0]
@ -1312,7 +1312,7 @@ class OptionParser (OptionContainer):
def add_option_group(self, *args, **kwargs): def add_option_group(self, *args, **kwargs):
# XXX lots of overlap with OptionContainer.add_option() # XXX lots of overlap with OptionContainer.add_option()
if type(args[0]) is types.StringType: if isbasestring(args[0]):
group = OptionGroup(self, *args, **kwargs) group = OptionGroup(self, *args, **kwargs)
elif len(args) == 1 and not kwargs: elif len(args) == 1 and not kwargs:
group = args[0] group = args[0]