Change isbasestring function as discussed on the cvs list a while ago

This commit is contained in:
Christian Heimes 2008-01-27 19:01:45 +00:00
parent ed444e52da
commit 5b25bc0598
1 changed files with 7 additions and 5 deletions

View File

@ -823,12 +823,14 @@ try:
except NameError:
(True, False) = (1, 0)
def isbasestring(x):
try:
try:
basestring
except NameError:
def isbasestring(x):
return isinstance(x, (types.StringType, types.UnicodeType))
else:
def isbasestring(x):
return isinstance(x, basestring)
except:
return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType)
class Values: