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/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: