fix inconsistent use of tabs and spaces

This commit is contained in:
Jeremy Hylton 2000-07-07 20:45:21 +00:00
parent bc30b11764
commit 65d6edb478
4 changed files with 24 additions and 24 deletions

View file

@ -828,7 +828,7 @@ def show_compilers():
from distutils.fancy_getopt import FancyGetopt from distutils.fancy_getopt import FancyGetopt
compilers = [] compilers = []
for compiler in compiler_class.keys(): for compiler in compiler_class.keys():
compilers.append(("compiler="+compiler, None, compilers.append(("compiler="+compiler, None,
compiler_class[compiler][2])) compiler_class[compiler][2]))
compilers.sort() compilers.sort()
pretty_printer = FancyGetopt(compilers) pretty_printer = FancyGetopt(compilers)

View file

@ -370,12 +370,12 @@ class build_ext (Command):
ext_filename = os.path.join (self.build_lib, ext_filename = os.path.join (self.build_lib,
self.get_ext_filename(fullname)) self.get_ext_filename(fullname))
if not (self.force or newer_group(sources, ext_filename, 'newer')): if not (self.force or newer_group(sources, ext_filename, 'newer')):
self.announce ("skipping '%s' extension (up-to-date)" % self.announce ("skipping '%s' extension (up-to-date)" %
ext.name) ext.name)
continue # 'for' loop over all extensions continue # 'for' loop over all extensions
else: else:
self.announce ("building '%s' extension" % ext.name) self.announce ("building '%s' extension" % ext.name)
# First, scan the sources for SWIG definition files (.i), run # First, scan the sources for SWIG definition files (.i), run
# SWIG on 'em to create .c files, and modify the sources list # SWIG on 'em to create .c files, and modify the sources list

View file

@ -22,7 +22,7 @@ class install_headers (Command):
def initialize_options (self): def initialize_options (self):
self.install_dir = None self.install_dir = None
self.outfiles = [] self.outfiles = []
def finalize_options (self): def finalize_options (self):
self.set_undefined_options('install', self.set_undefined_options('install',

View file

@ -275,13 +275,13 @@ class Distribution:
# What to call the per-user config file # What to call the per-user config file
if os.name == 'posix': if os.name == 'posix':
user_filename = ".pydistutils.cfg" user_filename = ".pydistutils.cfg"
else: else:
user_filename = "pydistutils.cfg" user_filename = "pydistutils.cfg"
# And look for the user config file # And look for the user config file
if os.environ.has_key('HOME'): if os.environ.has_key('HOME'):
user_file = os.path.join(os.environ.get('HOME'), user_filename) user_file = os.path.join(os.environ.get('HOME'), user_filename)
if os.path.isfile(user_file): if os.path.isfile(user_file):
files.append(user_file) files.append(user_file)
@ -439,7 +439,7 @@ class Distribution:
# Check for help_options in command class. They have a different # Check for help_options in command class. They have a different
# format (tuple of four) so we need to preprocess them here. # format (tuple of four) so we need to preprocess them here.
if (hasattr(cmd_class, 'help_options') and if (hasattr(cmd_class, 'help_options') and
type (cmd_class.help_options) is ListType): type (cmd_class.help_options) is ListType):
help_options = fix_help_options(cmd_class.help_options) help_options = fix_help_options(cmd_class.help_options)
else: else:
@ -457,17 +457,17 @@ class Distribution:
self._show_help(parser, display_options=0, commands=[cmd_class]) self._show_help(parser, display_options=0, commands=[cmd_class])
return return
if (hasattr(cmd_class, 'help_options') and if (hasattr(cmd_class, 'help_options') and
type (cmd_class.help_options) is ListType): type (cmd_class.help_options) is ListType):
help_option_found=0 help_option_found=0
for (help_option, short, desc, func) in cmd_class.help_options: for (help_option, short, desc, func) in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option)): if hasattr(opts, parser.get_attr_name(help_option)):
help_option_found=1 help_option_found=1
#print "showing help for option %s of command %s" % \ #print "showing help for option %s of command %s" % \
# (help_option[0],cmd_class) # (help_option[0],cmd_class)
if callable(func): if callable(func):
func() func()
else: else:
raise DistutilsClassError, \ raise DistutilsClassError, \
("invalid help function %s for help option '%s': " ("invalid help function %s for help option '%s': "
@ -475,7 +475,7 @@ class Distribution:
(`func`, help_option) (`func`, help_option)
if help_option_found: if help_option_found:
return return
# Put the options from the command-line into their official # Put the options from the command-line into their official
# holding pen, the 'command_options' dictionary. # holding pen, the 'command_options' dictionary.
@ -526,12 +526,12 @@ class Distribution:
klass = command klass = command
else: else:
klass = self.get_command_class (command) klass = self.get_command_class (command)
if (hasattr(klass, 'help_options') and if (hasattr(klass, 'help_options') and
type (klass.help_options) is ListType): type (klass.help_options) is ListType):
parser.set_option_table (klass.user_options + parser.set_option_table (klass.user_options +
fix_help_options(klass.help_options)) fix_help_options(klass.help_options))
else: else:
parser.set_option_table (klass.user_options) parser.set_option_table (klass.user_options)
parser.print_help ("Options for '%s' command:" % klass.__name__) parser.print_help ("Options for '%s' command:" % klass.__name__)
print print