Merged revisions 55795-55816 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
........
r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
........
r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
........
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py
index ea3799a..8d77e7f 100644
--- a/Lib/distutils/cmd.py
+++ b/Lib/distutils/cmd.py
@@ -9,7 +9,6 @@
__revision__ = "$Id$"
import sys, os, re
-from types import *
from distutils.errors import *
from distutils import util, dir_util, file_util, archive_util, dep_util
from distutils import log
@@ -245,7 +244,7 @@
elif isinstance(val, basestring):
setattr(self, option, re.split(r',\s*|\s+', val))
else:
- if type(val) is ListType:
+ if isinstance(val, list):
ok = all(isinstance(v, basestring) for v in val)
else:
ok = 0
@@ -422,7 +421,7 @@
# Allow 'infiles' to be a single string
if isinstance(infiles, basestring):
infiles = (infiles,)
- elif type(infiles) not in (ListType, TupleType):
+ elif not isinstance(infiles, (list, tuple)):
raise TypeError, \
"'infiles' must be a string, or a list or tuple of strings"