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"
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index e89d942..c01724d 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -9,7 +9,6 @@
__revision__ = "$Id$"
import sys, os, re
-from types import *
from copy import copy
try:
@@ -527,7 +526,7 @@
# Also make sure that the command object provides a list of its
# known options.
if not (hasattr(cmd_class, 'user_options') and
- type(cmd_class.user_options) is ListType):
+ isinstance(cmd_class.user_options, list)):
raise DistutilsClassError, \
("command class %s must provide " +
"'user_options' attribute (a list of tuples)") % \
@@ -543,7 +542,7 @@
# Check for help_options in command class. They have a different
# format (tuple of four) so we need to preprocess them here.
if (hasattr(cmd_class, 'help_options') and
- type(cmd_class.help_options) is ListType):
+ isinstance(cmd_class.help_options, list)):
help_options = fix_help_options(cmd_class.help_options)
else:
help_options = []
@@ -561,7 +560,7 @@
return
if (hasattr(cmd_class, 'help_options') and
- type(cmd_class.help_options) is ListType):
+ isinstance(cmd_class.help_options, list)):
help_option_found=0
for (help_option, short, desc, func) in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option)):
@@ -646,12 +645,12 @@
print()
for command in self.commands:
- if type(command) is ClassType and issubclass(command, Command):
+ if isinstance(command, type) and issubclass(command, Command):
klass = command
else:
klass = self.get_command_class(command)
if (hasattr(klass, 'help_options') and
- type(klass.help_options) is ListType):
+ isinstance(klass.help_options, list)):
parser.set_option_table(klass.user_options +
fix_help_options(klass.help_options))
else:
diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py
index 7fe846b..43b0d3f 100644
--- a/Lib/distutils/extension.py
+++ b/Lib/distutils/extension.py
@@ -6,7 +6,6 @@
__revision__ = "$Id$"
import os, sys
-from types import *
try:
import warnings
@@ -104,7 +103,7 @@
**kw # To catch unknown keywords
):
assert isinstance(name, basestring), "'name' must be a string"
- assert (type(sources) is ListType and
+ assert (isinstance(sources, list) and
all(isinstance(v, basestring) for v in sources)), \
"'sources' must be a list of strings"
diff --git a/Lib/distutils/text_file.py b/Lib/distutils/text_file.py
index 9d4d42b..3f6a220 100644
--- a/Lib/distutils/text_file.py
+++ b/Lib/distutils/text_file.py
@@ -6,7 +6,6 @@
__revision__ = "$Id$"
-from types import *
import sys, os, io
@@ -137,7 +136,7 @@
if line is None:
line = self.current_line
outmsg.append(self.filename + ", ")
- if type (line) in (ListType, TupleType):
+ if isinstance (line, (list, tuple)):
outmsg.append("lines %d-%d: " % tuple (line))
else:
outmsg.append("line %d: " % line)
@@ -239,7 +238,7 @@
line = buildup_line + line
# careful: pay attention to line number when incrementing it
- if type (self.current_line) is ListType:
+ if isinstance (self.current_line, list):
self.current_line[1] = self.current_line[1] + 1
else:
self.current_line = [self.current_line,
@@ -250,7 +249,7 @@
return None
# still have to be careful about incrementing the line number!
- if type (self.current_line) is ListType:
+ if isinstance (self.current_line, list):
self.current_line = self.current_line[1] + 1
else:
self.current_line = self.current_line + 1
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index a42ab5e..d07ae1e 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -16,7 +16,6 @@
__revision__ = "$Id$"
import os, sys
-from types import NoneType
from copy import copy
from distutils import sysconfig
@@ -212,7 +211,7 @@
lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
libraries)
- if not isinstance(output_dir, (basestring, NoneType)):
+ if not isinstance(output_dir, (basestring, type(None))):
raise TypeError, "'output_dir' must be a string or None"
if output_dir is not None:
output_filename = os.path.join(output_dir, output_filename)