mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch# 1258 by Christian Heimes: kill basestring.

Browse source 
I like this because it makes the code shorter! :-)
This commit is contained in:
Guido van Rossum 2007-10-16 18:12:55 +00:00
parent 60d241f135
commit 3172c5d263
77 changed files with 171 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/distutils/cmd.py
View file

@ -213,7 +213,7 @@ class Command:
if val is None:
setattr(self, option, default)
return default
elif not isinstance(val, basestring):
elif not isinstance(val, str):
raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
% (option, what, val))
return val
@ -233,11 +233,11 @@ class Command:
val = getattr(self, option)
if val is None:
return
elif isinstance(val, basestring):
elif isinstance(val, str):
setattr(self, option, re.split(r',\s*|\s+', val))
else:
if isinstance(val, list):
ok = all(isinstance(v, basestring) for v in val)
ok = all(isinstance(v, str) for v in val)
else:
ok = False
if not ok:
@ -390,7 +390,7 @@ class Command:
# Allow 'infiles' to be a single string
if isinstance(infiles, basestring):
if isinstance(infiles, str):
infiles = (infiles,)
elif not isinstance(infiles, (list, tuple)):
raise TypeError(